From e57ca02849c3d87142ff5ff9099a212e72b8139c Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Thu, 26 Jan 2017 12:28:58 +0100 Subject: Remove dynamic exception specifications ...(for now, from LIBO_INTERNAL_CODE only). See the mail thread starting at "Dynamic Exception Specifications" for details. Most changes have been done automatically by the rewriting loplugin:dynexcspec (after enabling the rewriting mode, to be committed shortly). The way it only removes exception specs from declarations if it also sees a definition, it identified some dead declarations-w/o-definitions (that have been removed manually) and some cases where a definition appeared in multiple include files (which have also been cleaned up manually). There's also been cases of macro paramters (that were used to abstract over exception specs) that have become unused now (and been removed). Furthermore, some code needed to be cleaned up manually (avmedia/source/quicktime/ and connectivity/source/drivers/kab/), as I had no configurations available that would actually build that code. Missing @throws documentation has not been applied in such manual clean-up. Change-Id: I3408691256c9b0c12bc5332de976743626e13960 Reviewed-on: https://gerrit.libreoffice.org/33574 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- UnoControls/inc/basecontainercontrol.hxx | 31 +- UnoControls/inc/basecontrol.hxx | 108 ++- UnoControls/inc/multiplexer.hxx | 72 +- UnoControls/source/base/basecontainercontrol.cxx | 28 +- UnoControls/source/base/basecontrol.cxx | 94 +-- UnoControls/source/base/multiplexer.cxx | 48 +- UnoControls/source/base/registercontrols.cxx | 4 - .../controls/OConnectionPointContainerHelper.cxx | 10 +- .../source/controls/OConnectionPointHelper.cxx | 14 +- UnoControls/source/controls/framecontrol.cxx | 33 +- UnoControls/source/controls/progressbar.cxx | 22 +- UnoControls/source/controls/progressmonitor.cxx | 46 +- UnoControls/source/controls/statusindicator.cxx | 32 +- .../source/inc/OConnectionPointContainerHelper.hxx | 12 +- UnoControls/source/inc/OConnectionPointHelper.hxx | 19 +- UnoControls/source/inc/framecontrol.hxx | 43 +- UnoControls/source/inc/progressbar.hxx | 28 +- UnoControls/source/inc/progressmonitor.hxx | 52 +- UnoControls/source/inc/statusindicator.hxx | 38 +- accessibility/inc/extended/AccessibleBrowseBox.hxx | 18 +- .../inc/extended/AccessibleBrowseBoxBase.hxx | 80 +- .../extended/AccessibleBrowseBoxCheckBoxCell.hxx | 18 +- .../inc/extended/AccessibleBrowseBoxHeaderBar.hxx | 89 +- .../inc/extended/AccessibleBrowseBoxHeaderCell.hxx | 10 +- .../inc/extended/AccessibleBrowseBoxTable.hxx | 55 +- .../inc/extended/AccessibleBrowseBoxTableBase.hxx | 59 +- .../inc/extended/AccessibleBrowseBoxTableCell.hxx | 56 +- .../inc/extended/AccessibleGridControl.hxx | 21 +- .../inc/extended/AccessibleGridControlBase.hxx | 74 +- .../inc/extended/AccessibleGridControlHeader.hxx | 55 +- .../extended/AccessibleGridControlHeaderCell.hxx | 16 +- .../inc/extended/AccessibleGridControlTable.hxx | 83 +- .../extended/AccessibleGridControlTableBase.hxx | 59 +- .../extended/AccessibleGridControlTableCell.hxx | 55 +- .../inc/extended/accessiblebrowseboxcell.hxx | 2 +- .../inc/extended/accessibleeditbrowseboxcell.hxx | 30 +- .../inc/extended/accessibleiconchoicectrl.hxx | 35 +- .../inc/extended/accessibleiconchoicectrlentry.hxx | 107 ++- accessibility/inc/extended/accessiblelistbox.hxx | 35 +- .../inc/extended/accessiblelistboxentry.hxx | 129 ++- accessibility/inc/extended/accessibletabbar.hxx | 44 +- .../inc/extended/accessibletabbarpage.hxx | 44 +- .../inc/extended/accessibletabbarpagelist.hxx | 58 +- .../inc/extended/accessibletablistbox.hxx | 9 +- .../inc/extended/accessibletablistboxtable.hxx | 17 +- accessibility/inc/extended/listboxaccessible.hxx | 2 +- .../inc/extended/textwindowaccessibility.hxx | 179 ++-- .../inc/standard/accessiblemenubasecomponent.hxx | 6 +- .../inc/standard/accessiblemenucomponent.hxx | 48 +- .../inc/standard/accessiblemenuitemcomponent.hxx | 34 +- accessibility/inc/standard/vclxaccessiblebox.hxx | 41 +- .../inc/standard/vclxaccessiblebutton.hxx | 22 +- .../inc/standard/vclxaccessiblecheckbox.hxx | 20 +- .../inc/standard/vclxaccessiblecombobox.hxx | 6 +- .../standard/vclxaccessibledropdowncombobox.hxx | 6 +- .../inc/standard/vclxaccessibledropdownlistbox.hxx | 6 +- accessibility/inc/standard/vclxaccessibleedit.hxx | 66 +- .../inc/standard/vclxaccessiblefixedhyperlink.hxx | 4 +- .../inc/standard/vclxaccessiblefixedtext.hxx | 4 +- accessibility/inc/standard/vclxaccessiblelist.hxx | 44 +- .../inc/standard/vclxaccessiblelistbox.hxx | 6 +- .../inc/standard/vclxaccessiblelistitem.hxx | 86 +- accessibility/inc/standard/vclxaccessiblemenu.hxx | 28 +- .../inc/standard/vclxaccessiblemenubar.hxx | 10 +- .../inc/standard/vclxaccessiblemenuitem.hxx | 56 +- .../inc/standard/vclxaccessiblemenuseparator.hxx | 6 +- .../inc/standard/vclxaccessiblepopupmenu.hxx | 10 +- .../inc/standard/vclxaccessibleradiobutton.hxx | 20 +- .../inc/standard/vclxaccessiblescrollbar.hxx | 22 +- .../inc/standard/vclxaccessiblestatusbar.hxx | 10 +- .../inc/standard/vclxaccessiblestatusbaritem.hxx | 58 +- .../inc/standard/vclxaccessibletabcontrol.hxx | 26 +- .../inc/standard/vclxaccessibletabpage.hxx | 58 +- .../inc/standard/vclxaccessibletabpagewindow.hxx | 6 +- .../inc/standard/vclxaccessibletextcomponent.hxx | 34 +- .../inc/standard/vclxaccessibletextfield.hxx | 21 +- .../inc/standard/vclxaccessibletoolbox.hxx | 24 +- .../inc/standard/vclxaccessibletoolboxitem.hxx | 72 +- .../source/extended/AccessibleBrowseBox.cxx | 7 +- .../source/extended/AccessibleBrowseBoxBase.cxx | 34 +- .../extended/AccessibleBrowseBoxCheckBoxCell.cxx | 17 +- .../extended/AccessibleBrowseBoxHeaderBar.cxx | 26 - .../extended/AccessibleBrowseBoxHeaderCell.cxx | 5 - .../source/extended/AccessibleBrowseBoxTable.cxx | 16 - .../extended/AccessibleBrowseBoxTableBase.cxx | 18 - .../extended/AccessibleBrowseBoxTableCell.cxx | 46 +- .../source/extended/AccessibleGridControl.cxx | 8 +- .../source/extended/AccessibleGridControlBase.cxx | 28 +- .../extended/AccessibleGridControlHeader.cxx | 16 - .../extended/AccessibleGridControlHeaderCell.cxx | 8 +- .../source/extended/AccessibleGridControlTable.cxx | 24 - .../extended/AccessibleGridControlTableBase.cxx | 18 - .../extended/AccessibleGridControlTableCell.cxx | 46 +- .../source/extended/accessiblebrowseboxcell.cxx | 2 +- .../extended/accessibleeditbrowseboxcell.cxx | 30 +- .../source/extended/accessibleiconchoicectrl.cxx | 34 +- .../extended/accessibleiconchoicectrlentry.cxx | 101 ++- .../source/extended/accessiblelistbox.cxx | 33 +- .../source/extended/accessiblelistboxentry.cxx | 124 ++- accessibility/source/extended/accessibletabbar.cxx | 44 +- .../source/extended/accessibletabbarpage.cxx | 44 +- .../source/extended/accessibletabbarpagelist.cxx | 58 +- .../source/extended/accessibletablistbox.cxx | 4 +- .../source/extended/accessibletablistboxtable.cxx | 16 +- .../source/extended/textwindowaccessibility.cxx | 80 +- .../standard/accessiblemenubasecomponent.cxx | 6 +- .../source/standard/accessiblemenucomponent.cxx | 48 +- .../standard/accessiblemenuitemcomponent.cxx | 34 +- .../source/standard/vclxaccessiblebox.cxx | 14 +- .../source/standard/vclxaccessiblebutton.cxx | 22 +- .../source/standard/vclxaccessiblecheckbox.cxx | 20 +- .../source/standard/vclxaccessiblecombobox.cxx | 2 - .../standard/vclxaccessibledropdowncombobox.cxx | 2 - .../standard/vclxaccessibledropdownlistbox.cxx | 2 - .../source/standard/vclxaccessibleedit.cxx | 66 +- .../standard/vclxaccessiblefixedhyperlink.cxx | 4 +- .../source/standard/vclxaccessiblefixedtext.cxx | 4 +- .../source/standard/vclxaccessiblelist.cxx | 27 +- .../source/standard/vclxaccessiblelistbox.cxx | 2 - .../source/standard/vclxaccessiblelistitem.cxx | 86 +- .../source/standard/vclxaccessiblemenu.cxx | 28 +- .../source/standard/vclxaccessiblemenubar.cxx | 10 +- .../source/standard/vclxaccessiblemenuitem.cxx | 56 +- .../standard/vclxaccessiblemenuseparator.cxx | 6 +- .../source/standard/vclxaccessiblepopupmenu.cxx | 10 +- .../source/standard/vclxaccessibleradiobutton.cxx | 20 +- .../source/standard/vclxaccessiblescrollbar.cxx | 22 +- .../source/standard/vclxaccessiblestatusbar.cxx | 10 +- .../standard/vclxaccessiblestatusbaritem.cxx | 58 +- .../source/standard/vclxaccessibletabcontrol.cxx | 26 +- .../source/standard/vclxaccessibletabpage.cxx | 58 +- .../standard/vclxaccessibletabpagewindow.cxx | 6 +- .../standard/vclxaccessibletextcomponent.cxx | 34 +- .../source/standard/vclxaccessibletextfield.cxx | 7 - .../source/standard/vclxaccessibletoolbox.cxx | 32 +- .../source/standard/vclxaccessibletoolboxitem.cxx | 74 +- animations/source/animcore/animcore.cxx | 410 +++++---- avmedia/source/framework/soundhandler.cxx | 18 +- avmedia/source/framework/soundhandler.hxx | 22 +- avmedia/source/gstreamer/gstframegrabber.cxx | 4 - avmedia/source/gstreamer/gstframegrabber.hxx | 8 +- avmedia/source/gstreamer/gstmanager.cxx | 4 - avmedia/source/gstreamer/gstmanager.hxx | 8 +- avmedia/source/gstreamer/gstplayer.cxx | 18 - avmedia/source/gstreamer/gstplayer.hxx | 36 +- avmedia/source/gstreamer/gstwindow.cxx | 27 - avmedia/source/gstreamer/gstwindow.hxx | 54 +- avmedia/source/macavf/framegrabber.hxx | 8 +- avmedia/source/macavf/framegrabber.mm | 4 - avmedia/source/macavf/manager.hxx | 8 +- avmedia/source/macavf/manager.mm | 4 - avmedia/source/macavf/player.hxx | 40 +- avmedia/source/macavf/player.mm | 20 - avmedia/source/macavf/window.hxx | 54 +- avmedia/source/macavf/window.mm | 27 - avmedia/source/opengl/oglframegrabber.cxx | 5 +- avmedia/source/opengl/oglframegrabber.hxx | 8 +- avmedia/source/opengl/oglmanager.cxx | 5 +- avmedia/source/opengl/oglmanager.hxx | 8 +- avmedia/source/opengl/oglplayer.cxx | 31 +- avmedia/source/opengl/oglplayer.hxx | 36 +- avmedia/source/opengl/oglwindow.cxx | 35 +- avmedia/source/opengl/oglwindow.hxx | 60 +- avmedia/source/quicktime/framegrabber.hxx | 8 +- avmedia/source/quicktime/framegrabber.mm | 4 - avmedia/source/quicktime/manager.hxx | 8 +- avmedia/source/quicktime/manager.mm | 4 - avmedia/source/quicktime/player.hxx | 36 +- avmedia/source/quicktime/player.mm | 18 - avmedia/source/quicktime/window.hxx | 54 +- avmedia/source/quicktime/window.mm | 27 - avmedia/source/viewer/mediaevent_impl.cxx | 11 - avmedia/source/viewer/mediaevent_impl.hxx | 22 +- avmedia/source/vlc/vlcframegrabber.cxx | 5 +- avmedia/source/vlc/vlcframegrabber.hxx | 14 +- avmedia/source/vlc/vlcmanager.cxx | 4 - avmedia/source/vlc/vlcmanager.hxx | 8 +- avmedia/source/vlc/vlcplayer.cxx | 31 +- avmedia/source/vlc/vlcplayer.hxx | 41 +- avmedia/source/vlc/vlcwindow.cxx | 35 +- avmedia/source/vlc/vlcwindow.hxx | 54 +- avmedia/source/win/framegrabber.cxx | 4 - avmedia/source/win/framegrabber.hxx | 8 +- avmedia/source/win/manager.cxx | 4 - avmedia/source/win/manager.hxx | 8 +- avmedia/source/win/player.cxx | 18 - avmedia/source/win/player.hxx | 36 +- avmedia/source/win/window.cxx | 27 - avmedia/source/win/window.hxx | 54 +- .../accessibility/accessibledialogcontrolshape.cxx | 48 +- .../accessibility/accessibledialogwindow.cxx | 57 +- basctl/source/basicide/basicrenderable.cxx | 6 +- basctl/source/basicide/basicrenderable.hxx | 9 +- basctl/source/basicide/baside2b.cxx | 4 +- basctl/source/basicide/basidectrlr.cxx | 8 +- basctl/source/basicide/basidesh.cxx | 8 +- basctl/source/basicide/basobj2.cxx | 1 - basctl/source/basicide/basobj3.cxx | 1 - basctl/source/basicide/doceventnotifier.cxx | 8 +- basctl/source/basicide/moduldl2.cxx | 10 +- basctl/source/basicide/unomodel.cxx | 18 +- basctl/source/basicide/unomodel.hxx | 29 +- basctl/source/dlged/dlgedclip.cxx | 8 +- basctl/source/dlged/dlgedlist.cxx | 12 +- basctl/source/dlged/dlgedobj.cxx | 12 +- basctl/source/inc/accessibledialogcontrolshape.hxx | 48 +- basctl/source/inc/accessibledialogwindow.hxx | 60 +- basctl/source/inc/basidectrlr.hxx | 8 +- basctl/source/inc/basobj.hxx | 6 +- basctl/source/inc/dlgedclip.hxx | 8 +- basctl/source/inc/dlgedlist.hxx | 12 +- basctl/source/inc/dlgedobj.hxx | 12 +- basegfx/source/tools/unopolypolygon.cxx | 39 +- basegfx/source/tools/unotools.cxx | 1 - basic/inc/sbobjmod.hxx | 2 +- basic/source/basmgr/basmgr.cxx | 152 +--- basic/source/classes/errobject.cxx | 56 +- basic/source/classes/eventatt.cxx | 14 +- basic/source/classes/propacc.cxx | 21 +- basic/source/classes/sb.cxx | 12 +- basic/source/classes/sbunoobj.cxx | 69 +- basic/source/classes/sbxmod.cxx | 68 +- basic/source/inc/dlgcont.hxx | 19 +- basic/source/inc/errobject.hxx | 3 +- basic/source/inc/namecont.hxx | 275 ++---- basic/source/inc/propacc.hxx | 30 +- basic/source/inc/scriptcont.hxx | 43 +- basic/source/runtime/comenumwrapper.cxx | 4 - basic/source/runtime/comenumwrapper.hxx | 4 +- basic/source/uno/dlgcont.cxx | 11 +- basic/source/uno/namecont.cxx | 84 +- basic/source/uno/scriptcont.cxx | 13 - binaryurp/source/bridge.cxx | 10 +- binaryurp/source/bridge.hxx | 18 +- binaryurp/source/bridgefactory.cxx | 10 +- binaryurp/source/bridgefactory.hxx | 19 +- canvas/source/cairo/cairo_canvas.cxx | 2 +- canvas/source/cairo/cairo_canvas.hxx | 2 +- canvas/source/cairo/cairo_canvasbitmap.cxx | 8 +- canvas/source/cairo/cairo_canvasbitmap.hxx | 10 +- canvas/source/cairo/cairo_canvascustomsprite.cxx | 6 +- canvas/source/cairo/cairo_canvascustomsprite.hxx | 6 +- canvas/source/cairo/cairo_canvasfont.cxx | 16 +- canvas/source/cairo/cairo_canvasfont.hxx | 16 +- canvas/source/cairo/cairo_canvashelper.cxx | 106 +-- canvas/source/cairo/cairo_spritecanvas.cxx | 8 +- canvas/source/cairo/cairo_spritecanvas.hxx | 8 +- canvas/source/cairo/cairo_textlayout.cxx | 40 +- canvas/source/cairo/cairo_textlayout.hxx | 40 +- canvas/source/directx/dx_canvas.cxx | 4 +- canvas/source/directx/dx_canvas.hxx | 4 +- canvas/source/directx/dx_canvasbitmap.cxx | 8 +- canvas/source/directx/dx_canvasbitmap.hxx | 10 +- canvas/source/directx/dx_canvascustomsprite.cxx | 6 +- canvas/source/directx/dx_canvascustomsprite.hxx | 6 +- canvas/source/directx/dx_canvasfont.cxx | 16 +- canvas/source/directx/dx_canvasfont.hxx | 16 +- canvas/source/directx/dx_spritecanvas.cxx | 8 +- canvas/source/directx/dx_spritecanvas.hxx | 8 +- canvas/source/directx/dx_textlayout.cxx | 40 +- canvas/source/directx/dx_textlayout.hxx | 40 +- canvas/source/factory/cf_service.cxx | 32 +- canvas/source/opengl/ogl_canvascustomsprite.cxx | 19 +- canvas/source/opengl/ogl_canvascustomsprite.hxx | 16 +- canvas/source/opengl/ogl_canvasfont.cxx | 10 +- canvas/source/opengl/ogl_canvasfont.hxx | 10 +- canvas/source/opengl/ogl_spritecanvas.cxx | 20 +- canvas/source/opengl/ogl_spritecanvas.hxx | 18 +- canvas/source/opengl/ogl_textlayout.cxx | 34 +- canvas/source/opengl/ogl_textlayout.hxx | 34 +- canvas/source/simplecanvas/simplecanvasimpl.cxx | 46 +- canvas/source/tools/cachedprimitivebase.cxx | 8 +- canvas/source/tools/canvastools.cxx | 94 +-- canvas/source/tools/parametricpolypolygon.cxx | 14 +- canvas/source/vcl/canvas.cxx | 2 +- canvas/source/vcl/canvas.hxx | 2 +- canvas/source/vcl/canvasbitmap.cxx | 8 +- canvas/source/vcl/canvasbitmap.hxx | 10 +- canvas/source/vcl/canvascustomsprite.cxx | 6 +- canvas/source/vcl/canvascustomsprite.hxx | 6 +- canvas/source/vcl/canvasfont.cxx | 16 +- canvas/source/vcl/canvasfont.hxx | 16 +- canvas/source/vcl/spritecanvas.cxx | 8 +- canvas/source/vcl/spritecanvas.hxx | 8 +- canvas/source/vcl/textlayout.cxx | 40 +- canvas/source/vcl/textlayout.hxx | 40 +- chart2/inc/ChartModel.hxx | 288 ++----- chart2/inc/ChartView.hxx | 72 +- .../controller/accessibility/AccessibleBase.cxx | 29 - .../accessibility/AccessibleChartElement.cxx | 17 - .../accessibility/AccessibleChartElement.hxx | 43 +- .../accessibility/AccessibleChartShape.cxx | 18 - .../accessibility/AccessibleChartShape.hxx | 46 +- .../accessibility/AccessibleChartView.cxx | 10 - .../accessibility/AccessibleTextHelper.cxx | 14 - .../controller/chartapiwrapper/AreaWrapper.cxx | 12 - .../controller/chartapiwrapper/AreaWrapper.hxx | 34 +- .../controller/chartapiwrapper/AxisWrapper.cxx | 20 +- .../controller/chartapiwrapper/AxisWrapper.hxx | 46 +- .../chartapiwrapper/ChartDataWrapper.cxx | 37 +- .../chartapiwrapper/ChartDataWrapper.hxx | 75 +- .../chartapiwrapper/ChartDocumentWrapper.cxx | 96 +-- .../chartapiwrapper/DataSeriesPointWrapper.cxx | 45 +- .../chartapiwrapper/DataSeriesPointWrapper.hxx | 34 +- .../controller/chartapiwrapper/DiagramWrapper.cxx | 167 +--- .../controller/chartapiwrapper/DiagramWrapper.hxx | 144 ++-- .../controller/chartapiwrapper/GridWrapper.cxx | 6 - .../controller/chartapiwrapper/GridWrapper.hxx | 18 +- .../controller/chartapiwrapper/LegendWrapper.cxx | 20 +- .../controller/chartapiwrapper/LegendWrapper.hxx | 34 +- .../chartapiwrapper/MinMaxLineWrapper.cxx | 25 - .../chartapiwrapper/MinMaxLineWrapper.hxx | 56 +- .../controller/chartapiwrapper/TitleWrapper.cxx | 33 +- .../controller/chartapiwrapper/TitleWrapper.hxx | 51 +- .../chartapiwrapper/UpDownBarWrapper.cxx | 25 - .../chartapiwrapper/UpDownBarWrapper.hxx | 56 +- .../chartapiwrapper/WallFloorWrapper.cxx | 6 - .../chartapiwrapper/WallFloorWrapper.hxx | 18 +- .../chartapiwrapper/WrappedAddInProperty.cxx | 8 - .../chartapiwrapper/WrappedAddInProperty.hxx | 24 +- .../WrappedAutomaticPositionProperties.cxx | 12 +- .../WrappedAxisAndGridExistenceProperties.cxx | 36 +- .../WrappedCharacterHeightProperty.cxx | 4 - .../WrappedCharacterHeightProperty.hxx | 12 +- .../chartapiwrapper/WrappedGL3DProperties.cxx | 19 +- .../chartapiwrapper/WrappedGapwidthProperty.cxx | 2 - .../chartapiwrapper/WrappedGapwidthProperty.hxx | 6 +- .../WrappedNumberFormatProperty.cxx | 6 - .../WrappedNumberFormatProperty.hxx | 18 +- .../chartapiwrapper/WrappedScaleProperty.cxx | 4 - .../chartapiwrapper/WrappedScaleProperty.hxx | 12 +- .../chartapiwrapper/WrappedScaleTextProperties.cxx | 12 +- .../chartapiwrapper/WrappedSceneProperty.cxx | 2 - .../chartapiwrapper/WrappedSceneProperty.hxx | 6 +- .../WrappedSeriesOrDiagramProperty.hxx | 9 +- .../chartapiwrapper/WrappedSplineProperties.cxx | 9 +- .../chartapiwrapper/WrappedStockProperties.cxx | 16 +- .../chartapiwrapper/WrappedSymbolProperties.cxx | 16 +- .../WrappedTextRotationProperty.cxx | 1 - .../WrappedTextRotationProperty.hxx | 3 +- .../dialogs/ChartTypeDialogController.cxx | 4 +- .../dialogs/ChartTypeDialogController.hxx | 4 +- .../controller/dialogs/RangeSelectionListener.cxx | 3 - .../controller/dialogs/dlg_ChartType_UNO.cxx | 8 +- .../controller/dialogs/dlg_CreationWizard_UNO.cxx | 31 +- chart2/source/controller/inc/AccessibleBase.hxx | 87 +- .../source/controller/inc/AccessibleChartView.hxx | 27 +- .../source/controller/inc/AccessibleTextHelper.hxx | 36 +- chart2/source/controller/inc/AxisItemConverter.hxx | 6 +- .../inc/CharacterPropertyItemConverter.hxx | 6 +- chart2/source/controller/inc/ChartController.hxx | 150 ++-- .../source/controller/inc/ChartDocumentWrapper.hxx | 102 +-- .../controller/inc/ChartToolbarController.hxx | 36 +- .../controller/inc/DataPointItemConverter.hxx | 6 +- .../controller/inc/ErrorBarItemConverter.hxx | 6 +- .../inc/GraphicPropertyItemConverter.hxx | 6 +- chart2/source/controller/inc/ItemConverter.hxx | 6 +- .../source/controller/inc/LegendItemConverter.hxx | 6 +- .../controller/inc/RangeSelectionListener.hxx | 9 +- .../inc/RegressionCurveItemConverter.hxx | 6 +- .../inc/RegressionEquationItemConverter.hxx | 6 +- .../controller/inc/SeriesOptionsItemConverter.hxx | 6 +- .../controller/inc/StatisticsItemConverter.hxx | 6 +- .../controller/inc/TextLabelItemConverter.hxx | 6 +- .../source/controller/inc/TitleItemConverter.hxx | 6 +- chart2/source/controller/inc/dlg_ChartType_UNO.hxx | 8 +- .../controller/inc/dlg_CreationWizard_UNO.hxx | 43 +- .../itemsetwrapper/AxisItemConverter.cxx | 2 - .../CharacterPropertyItemConverter.cxx | 2 - .../itemsetwrapper/DataPointItemConverter.cxx | 2 - .../itemsetwrapper/ErrorBarItemConverter.cxx | 2 - .../GraphicPropertyItemConverter.cxx | 2 - .../controller/itemsetwrapper/ItemConverter.cxx | 2 - .../itemsetwrapper/LegendItemConverter.cxx | 2 - .../RegressionCurveItemConverter.cxx | 2 - .../RegressionEquationItemConverter.cxx | 2 - .../itemsetwrapper/SeriesOptionsItemConverter.cxx | 2 - .../itemsetwrapper/StatisticsItemConverter.cxx | 2 - .../itemsetwrapper/TextLabelItemConverter.cxx | 2 - .../itemsetwrapper/TitleItemConverter.cxx | 2 - chart2/source/controller/main/ChartController.cxx | 30 - .../controller/main/ChartController_Window.cxx | 21 - chart2/source/controller/main/ChartFrameloader.cxx | 5 - chart2/source/controller/main/ChartFrameloader.hxx | 14 +- chart2/source/controller/main/CommandDispatch.cxx | 5 - chart2/source/controller/main/CommandDispatch.hxx | 15 +- .../controller/main/ControllerCommandDispatch.cxx | 4 - .../controller/main/ControllerCommandDispatch.hxx | 12 +- .../source/controller/main/DrawCommandDispatch.cxx | 1 - .../source/controller/main/DrawCommandDispatch.hxx | 3 +- chart2/source/controller/main/ElementSelector.cxx | 8 +- chart2/source/controller/main/ElementSelector.hxx | 15 +- .../controller/main/FeatureCommandDispatchBase.cxx | 1 - .../controller/main/FeatureCommandDispatchBase.hxx | 3 +- chart2/source/controller/main/ShapeController.cxx | 1 - chart2/source/controller/main/ShapeController.hxx | 3 +- .../controller/main/StatusBarCommandDispatch.cxx | 4 - .../controller/main/StatusBarCommandDispatch.hxx | 12 +- .../source/controller/main/ToolbarController.cxx | 12 - chart2/source/controller/main/UndoActions.cxx | 12 +- chart2/source/controller/main/UndoActions.hxx | 12 +- .../source/controller/main/UndoCommandDispatch.cxx | 2 - .../source/controller/main/UndoCommandDispatch.hxx | 6 +- .../controller/sidebar/Chart2PanelFactory.cxx | 7 - .../controller/sidebar/Chart2PanelFactory.hxx | 15 +- .../sidebar/ChartSidebarModifyListener.cxx | 2 - .../sidebar/ChartSidebarModifyListener.hxx | 6 +- .../sidebar/ChartSidebarSelectionListener.cxx | 2 - .../sidebar/ChartSidebarSelectionListener.hxx | 6 +- chart2/source/inc/CachedDataSequence.hxx | 41 +- chart2/source/inc/ConfigColorScheme.hxx | 12 +- chart2/source/inc/DataSource.hxx | 15 +- chart2/source/inc/ErrorBar.hxx | 62 +- .../inc/ExponentialRegressionCurveCalculator.hxx | 11 +- chart2/source/inc/InternalDataProvider.hxx | 136 +-- chart2/source/inc/LabeledDataSequence.hxx | 30 +- chart2/source/inc/LifeTime.hxx | 11 +- .../source/inc/LinearRegressionCurveCalculator.hxx | 7 +- .../inc/LogarithmicRegressionCurveCalculator.hxx | 11 +- .../inc/MeanValueRegressionCurveCalculator.hxx | 11 +- chart2/source/inc/ModifyListenerHelper.hxx | 12 +- .../inc/MovingAverageRegressionCurveCalculator.hxx | 11 +- chart2/source/inc/NameContainer.hxx | 24 +- chart2/source/inc/OPropertySet.hxx | 61 +- .../inc/PolynomialRegressionCurveCalculator.hxx | 7 +- .../inc/PotentialRegressionCurveCalculator.hxx | 11 +- chart2/source/inc/RangeHighlighter.hxx | 15 +- chart2/source/inc/RegressionCurveCalculator.hxx | 26 +- chart2/source/inc/Scaling.hxx | 68 +- chart2/source/inc/UncachedDataSequence.hxx | 71 +- chart2/source/inc/WeakListenerAdapter.hxx | 9 +- chart2/source/inc/WrappedDefaultProperty.hxx | 13 +- chart2/source/inc/WrappedDirectStateProperty.hxx | 4 +- chart2/source/inc/WrappedIgnoreProperty.hxx | 15 +- chart2/source/inc/WrappedProperty.hxx | 15 +- chart2/source/inc/WrappedPropertySet.hxx | 38 +- chart2/source/model/filter/XMLFilter.cxx | 9 - chart2/source/model/inc/BaseCoordinateSystem.hxx | 48 +- .../source/model/inc/CartesianCoordinateSystem.hxx | 36 +- chart2/source/model/inc/ChartTypeManager.hxx | 14 +- chart2/source/model/inc/DataSeries.hxx | 64 +- chart2/source/model/inc/Diagram.hxx | 81 +- chart2/source/model/inc/PolarCoordinateSystem.hxx | 36 +- chart2/source/model/inc/StockBar.hxx | 21 +- chart2/source/model/inc/XMLFilter.hxx | 34 +- chart2/source/model/main/Axis.cxx | 17 - chart2/source/model/main/Axis.hxx | 52 +- chart2/source/model/main/BaseCoordinateSystem.cxx | 20 - .../model/main/CartesianCoordinateSystem.cxx | 12 - chart2/source/model/main/ChartModel.cxx | 91 +- .../source/model/main/ChartModel_Persistence.cxx | 46 - chart2/source/model/main/DataPoint.cxx | 14 - chart2/source/model/main/DataPoint.hxx | 40 +- chart2/source/model/main/DataSeries.cxx | 24 - chart2/source/model/main/Diagram.cxx | 33 - chart2/source/model/main/FormattedString.cxx | 12 - chart2/source/model/main/FormattedString.hxx | 49 +- chart2/source/model/main/GridProperties.cxx | 10 - chart2/source/model/main/GridProperties.hxx | 30 +- chart2/source/model/main/Legend.cxx | 10 - chart2/source/model/main/Legend.hxx | 30 +- chart2/source/model/main/PageBackground.cxx | 10 - chart2/source/model/main/PageBackground.hxx | 30 +- chart2/source/model/main/PolarCoordinateSystem.cxx | 12 - chart2/source/model/main/StockBar.cxx | 7 - chart2/source/model/main/Title.cxx | 12 - chart2/source/model/main/Title.hxx | 36 +- chart2/source/model/main/UndoManager.cxx | 48 +- chart2/source/model/main/UndoManager.hxx | 48 +- chart2/source/model/main/Wall.cxx | 7 - chart2/source/model/main/Wall.hxx | 21 +- chart2/source/model/template/AreaChartType.cxx | 5 - chart2/source/model/template/AreaChartType.hxx | 15 +- .../model/template/AreaChartTypeTemplate.cxx | 5 - .../model/template/AreaChartTypeTemplate.hxx | 15 +- chart2/source/model/template/BarChartType.cxx | 6 - chart2/source/model/template/BarChartType.hxx | 18 +- .../source/model/template/BarChartTypeTemplate.cxx | 6 - .../source/model/template/BarChartTypeTemplate.hxx | 18 +- chart2/source/model/template/BubbleChartType.cxx | 12 - chart2/source/model/template/BubbleChartType.hxx | 34 +- .../model/template/BubbleChartTypeTemplate.cxx | 6 - .../model/template/BubbleChartTypeTemplate.hxx | 18 +- .../model/template/BubbleDataInterpreter.cxx | 3 - .../model/template/BubbleDataInterpreter.hxx | 9 +- .../source/model/template/CandleStickChartType.cxx | 11 - .../source/model/template/CandleStickChartType.hxx | 33 +- chart2/source/model/template/ChartType.cxx | 19 - chart2/source/model/template/ChartType.hxx | 52 +- chart2/source/model/template/ChartTypeManager.cxx | 8 - chart2/source/model/template/ChartTypeTemplate.cxx | 10 - chart2/source/model/template/ChartTypeTemplate.hxx | 30 +- chart2/source/model/template/ColumnChartType.cxx | 8 - chart2/source/model/template/ColumnChartType.hxx | 24 +- .../model/template/ColumnLineChartTypeTemplate.cxx | 6 - .../model/template/ColumnLineChartTypeTemplate.hxx | 18 +- .../model/template/ColumnLineDataInterpreter.cxx | 1 - .../model/template/ColumnLineDataInterpreter.hxx | 3 +- chart2/source/model/template/DataInterpreter.cxx | 7 - chart2/source/model/template/DataInterpreter.hxx | 21 +- .../source/model/template/FilledNetChartType.cxx | 5 - .../source/model/template/FilledNetChartType.hxx | 15 +- chart2/source/model/template/GL3DBarChartType.cxx | 8 - chart2/source/model/template/GL3DBarChartType.hxx | 24 +- .../model/template/GL3DBarChartTypeTemplate.cxx | 5 - .../model/template/GL3DBarChartTypeTemplate.hxx | 15 +- chart2/source/model/template/LineChartType.cxx | 7 - chart2/source/model/template/LineChartType.hxx | 21 +- .../model/template/LineChartTypeTemplate.cxx | 5 - .../model/template/LineChartTypeTemplate.hxx | 15 +- chart2/source/model/template/NetChartType.cxx | 9 - chart2/source/model/template/NetChartType.hxx | 25 +- .../source/model/template/NetChartTypeTemplate.cxx | 3 - .../source/model/template/NetChartTypeTemplate.hxx | 9 +- chart2/source/model/template/PieChartType.cxx | 10 - chart2/source/model/template/PieChartType.hxx | 28 +- .../source/model/template/PieChartTypeTemplate.cxx | 6 - .../source/model/template/PieChartTypeTemplate.hxx | 18 +- chart2/source/model/template/ScatterChartType.cxx | 10 - chart2/source/model/template/ScatterChartType.hxx | 28 +- .../model/template/ScatterChartTypeTemplate.cxx | 7 - .../model/template/ScatterChartTypeTemplate.hxx | 21 +- .../model/template/StockChartTypeTemplate.cxx | 7 - .../model/template/StockChartTypeTemplate.hxx | 21 +- .../source/model/template/StockDataInterpreter.cxx | 3 - .../source/model/template/StockDataInterpreter.hxx | 9 +- chart2/source/model/template/XYDataInterpreter.cxx | 3 - chart2/source/model/template/XYDataInterpreter.hxx | 9 +- chart2/source/tools/CachedDataSequence.cxx | 16 +- chart2/source/tools/ConfigColorScheme.cxx | 4 - chart2/source/tools/DataSource.cxx | 5 - chart2/source/tools/ErrorBar.cxx | 22 - .../tools/ExponentialRegressionCurveCalculator.cxx | 5 - chart2/source/tools/InternalDataProvider.cxx | 61 +- chart2/source/tools/LabeledDataSequence.cxx | 10 - chart2/source/tools/LifeTime.cxx | 4 - .../tools/LinearRegressionCurveCalculator.cxx | 3 - .../tools/LogarithmicRegressionCurveCalculator.cxx | 5 - .../tools/MeanValueRegressionCurveCalculator.cxx | 5 - chart2/source/tools/ModifyListenerHelper.cxx | 4 - .../MovingAverageRegressionCurveCalculator.cxx | 5 - chart2/source/tools/NameContainer.cxx | 12 - chart2/source/tools/OPropertySet.cxx | 31 - .../tools/PolynomialRegressionCurveCalculator.cxx | 3 - .../tools/PotentialRegressionCurveCalculator.cxx | 5 - chart2/source/tools/RangeHighlighter.cxx | 5 - chart2/source/tools/RegressionCurveCalculator.cxx | 6 - chart2/source/tools/RegressionCurveModel.cxx | 38 - chart2/source/tools/RegressionCurveModel.hxx | 114 +-- chart2/source/tools/RegressionEquation.cxx | 12 - chart2/source/tools/RegressionEquation.hxx | 31 +- chart2/source/tools/Scaling.cxx | 24 - chart2/source/tools/UncachedDataSequence.cxx | 29 - chart2/source/tools/WeakListenerAdapter.cxx | 2 - chart2/source/tools/WrappedDefaultProperty.cxx | 7 - chart2/source/tools/WrappedDirectStateProperty.cxx | 2 - chart2/source/tools/WrappedIgnoreProperty.cxx | 5 - chart2/source/tools/WrappedProperty.cxx | 5 - chart2/source/tools/WrappedPropertySet.cxx | 19 - chart2/source/view/axes/DateScaling.cxx | 12 - chart2/source/view/axes/DateScaling.hxx | 34 +- chart2/source/view/axes/VAxisBase.cxx | 1 - chart2/source/view/axes/VAxisBase.hxx | 3 +- chart2/source/view/axes/VAxisOrGridBase.cxx | 1 - chart2/source/view/axes/VAxisOrGridBase.hxx | 3 +- .../view/axes/VCartesianCoordinateSystem.cxx | 3 +- chart2/source/view/axes/VCoordinateSystem.cxx | 1 - chart2/source/view/axes/VPolarRadiusAxis.cxx | 2 - chart2/source/view/axes/VPolarRadiusAxis.hxx | 5 +- chart2/source/view/charttypes/VSeriesPlotter.cxx | 1 - chart2/source/view/inc/Linear3DTransformation.hxx | 10 +- chart2/source/view/inc/PlotterBase.hxx | 2 +- chart2/source/view/inc/VCoordinateSystem.hxx | 3 +- chart2/source/view/inc/VPolarTransformation.hxx | 10 +- chart2/source/view/inc/VSeriesPlotter.hxx | 3 +- chart2/source/view/main/ChartView.cxx | 34 +- chart2/source/view/main/DummyXShape.cxx | 60 +- chart2/source/view/main/DummyXShape.hxx | 84 +- chart2/source/view/main/Linear3DTransformation.cxx | 4 - chart2/source/view/main/PlotterBase.cxx | 1 - chart2/source/view/main/VPolarTransformation.cxx | 4 - codemaker/source/codemaker/options.cxx | 1 - codemaker/source/cppumaker/cppuoptions.cxx | 1 - codemaker/source/cppumaker/cppuoptions.hxx | 3 +- codemaker/source/javamaker/javaoptions.cxx | 1 - codemaker/source/javamaker/javaoptions.hxx | 3 +- comphelper/qa/container/comphelper_ifcontainer.cxx | 3 +- comphelper/qa/container/testifcontainer.cxx | 5 +- comphelper/qa/string/test_string.cxx | 62 +- comphelper/source/compare/AnyCompareFactory.cxx | 25 +- .../container/IndexedPropertyValuesContainer.cxx | 48 +- .../container/NamedPropertyValuesContainer.cxx | 52 +- .../source/container/containermultiplexer.cxx | 12 +- comphelper/source/container/enumerablemap.cxx | 76 +- comphelper/source/container/enumhelper.cxx | 11 +- comphelper/source/container/namecontainer.cxx | 40 +- .../source/eventattachermgr/eventattachermgr.cxx | 71 +- comphelper/source/misc/SelectionMultiplex.cxx | 5 +- .../source/misc/accessiblecomponenthelper.cxx | 30 +- comphelper/source/misc/accessiblecontexthelper.cxx | 8 +- .../source/misc/accessiblekeybindinghelper.cxx | 8 +- .../source/misc/accessibleselectionhelper.cxx | 30 +- comphelper/source/misc/accessibletexthelper.cxx | 40 +- comphelper/source/misc/accessiblewrapper.cxx | 48 +- comphelper/source/misc/accimplaccess.cxx | 2 +- comphelper/source/misc/configuration.cxx | 2 - comphelper/source/misc/docpasswordrequest.cxx | 24 +- comphelper/source/misc/documentiologring.cxx | 12 +- comphelper/source/misc/documentiologring.hxx | 12 +- comphelper/source/misc/evtlistenerhlp.cxx | 2 +- comphelper/source/misc/instancelocker.cxx | 12 - comphelper/source/misc/instancelocker.hxx | 24 +- comphelper/source/misc/interaction.cxx | 8 +- comphelper/source/misc/numberedcollection.cxx | 7 - comphelper/source/misc/officerestartmanager.cxx | 9 +- comphelper/source/misc/officerestartmanager.hxx | 12 +- comphelper/source/misc/proxyaggregation.cxx | 18 +- comphelper/source/misc/servicedecl.cxx | 20 +- comphelper/source/misc/serviceinfohelper.cxx | 4 +- comphelper/source/misc/storagehelper.cxx | 14 - comphelper/source/misc/types.cxx | 2 +- comphelper/source/misc/weak.cxx | 6 +- .../officeinstallationdirectories.cxx | 7 - .../officeinstallationdirectories.hxx | 21 +- .../source/property/ChainablePropertySet.cxx | 22 - .../source/property/ChainablePropertySetInfo.cxx | 3 - comphelper/source/property/MasterPropertySet.cxx | 21 - .../source/property/MasterPropertySetInfo.cxx | 3 - comphelper/source/property/genericpropertyset.cxx | 37 +- comphelper/source/property/opropertybag.cxx | 38 +- comphelper/source/property/opropertybag.hxx | 59 +- comphelper/source/property/propagg.cxx | 32 +- comphelper/source/property/propertycontainer.cxx | 7 +- comphelper/source/property/propertysethelper.cxx | 33 +- comphelper/source/property/propertysetinfo.cxx | 10 +- .../source/property/propertystatecontainer.cxx | 10 +- comphelper/source/property/propmultiplex.cxx | 5 +- comphelper/source/property/propstate.cxx | 16 +- comphelper/source/streaming/memorystream.cxx | 68 +- comphelper/source/streaming/oslfile2streamwrap.cxx | 15 +- comphelper/source/streaming/seekableinput.cxx | 25 - comphelper/source/streaming/seqinputstreamserv.cxx | 48 +- .../source/streaming/seqoutputstreamserv.cxx | 28 +- comphelper/source/streaming/seqstream.cxx | 20 +- comphelper/source/xml/attributelist.cxx | 14 +- comphelper/source/xml/ofopxmlhelper.cxx | 32 +- configmgr/qa/unit/test.cxx | 8 +- configmgr/source/access.cxx | 100 +-- configmgr/source/access.hxx | 223 ++--- configmgr/source/childaccess.cxx | 4 - configmgr/source/childaccess.hxx | 14 +- configmgr/source/configurationprovider.cxx | 68 +- configmgr/source/configurationregistry.cxx | 271 ++---- configmgr/source/readonlyaccess.cxx | 19 +- configmgr/source/readwriteaccess.cxx | 40 +- configmgr/source/rootaccess.cxx | 10 +- configmgr/source/rootaccess.hxx | 24 +- configmgr/source/update.cxx | 19 +- connectivity/source/commontools/BlobHelper.cxx | 10 +- .../source/commontools/ConnectionWrapper.cxx | 12 +- connectivity/source/commontools/DateConversion.cxx | 4 +- .../commontools/FDatabaseMetaDataResultSet.cxx | 110 +-- .../FDatabaseMetaDataResultSetMetaData.cxx | 42 +- .../source/commontools/ParamterSubstitution.cxx | 18 +- connectivity/source/commontools/TColumnsHelper.cxx | 2 +- connectivity/source/commontools/TConnection.cxx | 2 +- .../source/commontools/TDatabaseMetaDataBase.cxx | 60 +- connectivity/source/commontools/TIndexColumns.cxx | 2 +- connectivity/source/commontools/TIndexes.cxx | 2 +- connectivity/source/commontools/TKeyColumns.cxx | 2 +- connectivity/source/commontools/TKeys.cxx | 2 +- .../source/commontools/TPrivilegesResultSet.cxx | 2 +- connectivity/source/commontools/TTableHelper.cxx | 14 +- connectivity/source/commontools/conncleanup.cxx | 10 +- connectivity/source/commontools/dbexception.cxx | 17 +- connectivity/source/commontools/dbtools.cxx | 16 +- connectivity/source/commontools/parameters.cxx | 2 +- connectivity/source/commontools/paramwrapper.cxx | 19 +- connectivity/source/cpool/ZConnectionPool.cxx | 6 +- connectivity/source/cpool/ZConnectionPool.hxx | 6 +- connectivity/source/cpool/ZConnectionWrapper.cxx | 40 +- connectivity/source/cpool/ZConnectionWrapper.hxx | 38 +- connectivity/source/cpool/ZDriverWrapper.cxx | 12 +- connectivity/source/cpool/ZDriverWrapper.hxx | 12 +- connectivity/source/cpool/ZPoolCollection.cxx | 28 +- connectivity/source/cpool/ZPoolCollection.hxx | 28 +- connectivity/source/cpool/ZPooledConnection.cxx | 4 +- connectivity/source/cpool/ZPooledConnection.hxx | 4 +- .../source/drivers/ado/ACallableStatement.cxx | 46 +- connectivity/source/drivers/ado/AColumn.cxx | 4 +- connectivity/source/drivers/ado/AColumns.cxx | 2 +- connectivity/source/drivers/ado/AConnection.cxx | 48 +- .../source/drivers/ado/ADatabaseMetaData.cxx | 270 +++--- .../source/drivers/ado/ADatabaseMetaDataImpl.cxx | 16 +- .../drivers/ado/ADatabaseMetaDataResultSet.cxx | 107 ++- .../ado/ADatabaseMetaDataResultSetMetaData.cxx | 26 +- connectivity/source/drivers/ado/ADriver.cxx | 27 +- connectivity/source/drivers/ado/AGroup.cxx | 12 +- connectivity/source/drivers/ado/AGroups.cxx | 2 +- connectivity/source/drivers/ado/AIndex.cxx | 4 +- connectivity/source/drivers/ado/AIndexes.cxx | 2 +- connectivity/source/drivers/ado/AKey.cxx | 4 +- connectivity/source/drivers/ado/AKeys.cxx | 2 +- .../source/drivers/ado/APreparedStatement.cxx | 64 +- connectivity/source/drivers/ado/AResultSet.cxx | 172 ++-- .../source/drivers/ado/AResultSetMetaData.cxx | 42 +- connectivity/source/drivers/ado/AStatement.cxx | 79 +- connectivity/source/drivers/ado/ATable.cxx | 12 +- connectivity/source/drivers/ado/ATables.cxx | 2 +- connectivity/source/drivers/ado/AUser.cxx | 14 +- connectivity/source/drivers/ado/AUsers.cxx | 2 +- connectivity/source/drivers/ado/AView.cxx | 2 +- connectivity/source/drivers/ado/AViews.cxx | 2 +- connectivity/source/drivers/ado/adoimp.cxx | 2 +- connectivity/source/drivers/calc/CConnection.cxx | 7 +- .../source/drivers/calc/CDatabaseMetaData.cxx | 15 +- connectivity/source/drivers/calc/CDriver.cxx | 11 +- connectivity/source/drivers/calc/CResultSet.cxx | 26 +- connectivity/source/drivers/calc/CTable.cxx | 6 +- connectivity/source/drivers/dbase/DColumns.cxx | 2 +- connectivity/source/drivers/dbase/DConnection.cxx | 8 +- .../source/drivers/dbase/DDatabaseMetaData.cxx | 22 +- connectivity/source/drivers/dbase/DDriver.cxx | 12 +- connectivity/source/drivers/dbase/DIndex.cxx | 2 +- .../source/drivers/dbase/DIndexColumns.cxx | 2 +- connectivity/source/drivers/dbase/DIndexes.cxx | 2 +- connectivity/source/drivers/dbase/DResultSet.cxx | 26 +- connectivity/source/drivers/dbase/DTable.cxx | 14 +- connectivity/source/drivers/dbase/DTables.cxx | 4 +- connectivity/source/drivers/evoab2/NCatalog.cxx | 2 +- connectivity/source/drivers/evoab2/NCatalog.hxx | 2 +- connectivity/source/drivers/evoab2/NColumns.cxx | 2 +- connectivity/source/drivers/evoab2/NColumns.hxx | 2 +- connectivity/source/drivers/evoab2/NConnection.cxx | 44 +- connectivity/source/drivers/evoab2/NConnection.hxx | 44 +- .../source/drivers/evoab2/NDatabaseMetaData.cxx | 242 +++--- .../source/drivers/evoab2/NDatabaseMetaData.hxx | 246 +++--- connectivity/source/drivers/evoab2/NDriver.cxx | 21 +- connectivity/source/drivers/evoab2/NDriver.hxx | 22 +- .../source/drivers/evoab2/NPreparedStatement.cxx | 68 +- .../source/drivers/evoab2/NPreparedStatement.hxx | 68 +- connectivity/source/drivers/evoab2/NResultSet.cxx | 100 +-- connectivity/source/drivers/evoab2/NResultSet.hxx | 94 +-- .../source/drivers/evoab2/NResultSetMetaData.cxx | 44 +- .../source/drivers/evoab2/NResultSetMetaData.hxx | 44 +- connectivity/source/drivers/evoab2/NStatement.cxx | 20 +- connectivity/source/drivers/evoab2/NStatement.hxx | 22 +- connectivity/source/drivers/evoab2/NTables.cxx | 2 +- connectivity/source/drivers/evoab2/NTables.hxx | 2 +- connectivity/source/drivers/file/FCatalog.cxx | 4 +- connectivity/source/drivers/file/FColumns.cxx | 2 +- connectivity/source/drivers/file/FConnection.cxx | 48 +- .../source/drivers/file/FDatabaseMetaData.cxx | 244 +++--- connectivity/source/drivers/file/FDriver.cxx | 23 +- .../source/drivers/file/FPreparedStatement.cxx | 64 +- connectivity/source/drivers/file/FResultSet.cxx | 149 ++-- .../source/drivers/file/FResultSetMetaData.cxx | 44 +- connectivity/source/drivers/file/FStatement.cxx | 28 +- connectivity/source/drivers/file/FTable.cxx | 4 +- connectivity/source/drivers/file/FTables.cxx | 4 +- connectivity/source/drivers/file/fcomp.cxx | 14 +- connectivity/source/drivers/firebird/Blob.cxx | 12 - connectivity/source/drivers/firebird/Blob.hxx | 54 +- connectivity/source/drivers/firebird/Clob.cxx | 5 - connectivity/source/drivers/firebird/Clob.hxx | 20 +- connectivity/source/drivers/firebird/Column.cxx | 2 +- connectivity/source/drivers/firebird/Column.hxx | 2 +- .../source/drivers/firebird/Connection.cxx | 43 +- .../source/drivers/firebird/Connection.hxx | 68 +- .../source/drivers/firebird/DatabaseMetaData.cxx | 246 +++--- .../source/drivers/firebird/DatabaseMetaData.hxx | 298 +++---- connectivity/source/drivers/firebird/Driver.cxx | 21 +- connectivity/source/drivers/firebird/Driver.hxx | 30 +- .../source/drivers/firebird/PreparedStatement.cxx | 49 +- .../source/drivers/firebird/PreparedStatement.hxx | 111 +-- connectivity/source/drivers/firebird/ResultSet.cxx | 81 +- connectivity/source/drivers/firebird/ResultSet.hxx | 101 ++- .../source/drivers/firebird/ResultSetMetaData.cxx | 25 +- .../source/drivers/firebird/ResultSetMetaData.hxx | 65 +- connectivity/source/drivers/firebird/Statement.cxx | 12 +- connectivity/source/drivers/firebird/Statement.hxx | 24 +- .../drivers/firebird/StatementCommonBase.cxx | 27 +- .../drivers/firebird/StatementCommonBase.hxx | 40 +- .../source/drivers/firebird/SubComponent.hxx | 2 +- connectivity/source/drivers/firebird/Table.cxx | 4 - connectivity/source/drivers/firebird/Table.hxx | 16 +- connectivity/source/drivers/firebird/Tables.cxx | 1 - connectivity/source/drivers/firebird/Tables.hxx | 3 +- connectivity/source/drivers/firebird/Users.cxx | 1 - connectivity/source/drivers/firebird/Users.hxx | 3 +- connectivity/source/drivers/firebird/Util.cxx | 1 - connectivity/source/drivers/firebird/Util.hxx | 3 +- connectivity/source/drivers/flat/EConnection.cxx | 9 +- .../source/drivers/flat/EDatabaseMetaData.cxx | 4 +- connectivity/source/drivers/flat/EDriver.cxx | 11 +- connectivity/source/drivers/flat/EResultSet.cxx | 24 +- connectivity/source/drivers/flat/ETable.cxx | 6 +- connectivity/source/drivers/hsqldb/HCatalog.cxx | 4 +- connectivity/source/drivers/hsqldb/HColumns.cxx | 2 +- connectivity/source/drivers/hsqldb/HConnection.cxx | 10 +- connectivity/source/drivers/hsqldb/HDriver.cxx | 38 +- connectivity/source/drivers/hsqldb/HTable.cxx | 10 +- connectivity/source/drivers/hsqldb/HTables.cxx | 2 +- .../source/drivers/hsqldb/HTerminateListener.cxx | 3 - .../source/drivers/hsqldb/HTerminateListener.hxx | 9 +- connectivity/source/drivers/hsqldb/HUser.cxx | 12 +- connectivity/source/drivers/hsqldb/HUsers.cxx | 2 +- connectivity/source/drivers/hsqldb/HView.cxx | 2 +- connectivity/source/drivers/hsqldb/HViews.cxx | 2 +- connectivity/source/drivers/jdbc/Array.cxx | 12 +- connectivity/source/drivers/jdbc/Blob.cxx | 10 +- .../source/drivers/jdbc/CallableStatement.cxx | 48 +- connectivity/source/drivers/jdbc/Clob.cxx | 10 +- .../source/drivers/jdbc/DatabaseMetaData.cxx | 268 +++--- connectivity/source/drivers/jdbc/InputStream.cxx | 10 +- connectivity/source/drivers/jdbc/JConnection.cxx | 42 +- connectivity/source/drivers/jdbc/JDriver.cxx | 22 +- connectivity/source/drivers/jdbc/JStatement.cxx | 74 +- .../source/drivers/jdbc/PreparedStatement.cxx | 66 +- connectivity/source/drivers/jdbc/Reader.cxx | 10 +- connectivity/source/drivers/jdbc/Ref.cxx | 2 +- connectivity/source/drivers/jdbc/ResultSet.cxx | 156 ++-- .../source/drivers/jdbc/ResultSetMetaData.cxx | 42 +- connectivity/source/drivers/jdbc/tools.cxx | 2 +- connectivity/source/drivers/kab/KCatalog.cxx | 2 +- connectivity/source/drivers/kab/KCatalog.hxx | 2 +- connectivity/source/drivers/kab/KColumns.cxx | 2 +- connectivity/source/drivers/kab/KColumns.hxx | 2 +- connectivity/source/drivers/kab/KConnection.cxx | 42 +- connectivity/source/drivers/kab/KConnection.hxx | 44 +- .../source/drivers/kab/KDatabaseMetaData.cxx | 298 +++---- .../source/drivers/kab/KDatabaseMetaData.hxx | 298 +++---- connectivity/source/drivers/kab/KDriver.cxx | 27 +- connectivity/source/drivers/kab/KDriver.hxx | 28 +- .../source/drivers/kab/KPreparedStatement.cxx | 68 +- .../source/drivers/kab/KPreparedStatement.hxx | 68 +- connectivity/source/drivers/kab/KResultSet.cxx | 156 ++-- connectivity/source/drivers/kab/KResultSet.hxx | 160 ++-- .../source/drivers/kab/KResultSetMetaData.cxx | 44 +- .../source/drivers/kab/KResultSetMetaData.hxx | 44 +- connectivity/source/drivers/kab/KStatement.cxx | 40 +- connectivity/source/drivers/kab/KStatement.hxx | 40 +- connectivity/source/drivers/kab/KTables.cxx | 2 +- connectivity/source/drivers/kab/KTables.hxx | 2 +- connectivity/source/drivers/kab/kcondition.cxx | 14 +- connectivity/source/drivers/kab/kcondition.hxx | 14 +- connectivity/source/drivers/kab/kfields.cxx | 2 +- connectivity/source/drivers/kab/kfields.hxx | 2 +- connectivity/source/drivers/macab/MacabCatalog.cxx | 2 +- connectivity/source/drivers/macab/MacabCatalog.hxx | 2 +- connectivity/source/drivers/macab/MacabColumns.cxx | 2 +- connectivity/source/drivers/macab/MacabColumns.hxx | 2 +- .../source/drivers/macab/MacabConnection.cxx | 44 +- .../source/drivers/macab/MacabConnection.hxx | 47 +- .../source/drivers/macab/MacabDatabaseMetaData.cxx | 298 +++---- .../source/drivers/macab/MacabDatabaseMetaData.hxx | 298 +++---- connectivity/source/drivers/macab/MacabDriver.cxx | 27 +- connectivity/source/drivers/macab/MacabDriver.hxx | 28 +- .../drivers/macab/MacabPreparedStatement.cxx | 68 +- .../drivers/macab/MacabPreparedStatement.hxx | 68 +- .../source/drivers/macab/MacabResultSet.cxx | 156 ++-- .../source/drivers/macab/MacabResultSet.hxx | 160 ++-- .../drivers/macab/MacabResultSetMetaData.cxx | 44 +- .../drivers/macab/MacabResultSetMetaData.hxx | 44 +- .../source/drivers/macab/MacabStatement.cxx | 40 +- .../source/drivers/macab/MacabStatement.hxx | 40 +- connectivity/source/drivers/macab/MacabTables.cxx | 2 +- connectivity/source/drivers/macab/MacabTables.hxx | 2 +- .../source/drivers/macab/macabcondition.cxx | 14 +- .../source/drivers/macab/macabcondition.hxx | 14 +- connectivity/source/drivers/mork/MCatalog.cxx | 2 +- connectivity/source/drivers/mork/MCatalog.hxx | 2 +- connectivity/source/drivers/mork/MColumns.cxx | 2 +- connectivity/source/drivers/mork/MColumns.hxx | 2 +- connectivity/source/drivers/mork/MConnection.cxx | 44 +- connectivity/source/drivers/mork/MConnection.hxx | 44 +- .../source/drivers/mork/MDatabaseMetaData.cxx | 246 +++--- .../source/drivers/mork/MDatabaseMetaData.hxx | 252 +++--- connectivity/source/drivers/mork/MDriver.cxx | 10 +- connectivity/source/drivers/mork/MDriver.hxx | 23 +- .../source/drivers/mork/MPreparedStatement.cxx | 69 +- .../source/drivers/mork/MPreparedStatement.hxx | 71 +- connectivity/source/drivers/mork/MResultSet.cxx | 179 ++-- connectivity/source/drivers/mork/MResultSet.hxx | 181 ++-- .../source/drivers/mork/MResultSetMetaData.cxx | 44 +- .../source/drivers/mork/MResultSetMetaData.hxx | 44 +- connectivity/source/drivers/mork/MStatement.cxx | 26 +- connectivity/source/drivers/mork/MStatement.hxx | 29 +- connectivity/source/drivers/mork/MTables.cxx | 2 +- connectivity/source/drivers/mork/MTables.hxx | 2 +- .../drivers/mozab/bootstrap/MMozillaBootstrap.cxx | 32 +- .../drivers/mozab/bootstrap/MMozillaBootstrap.hxx | 32 +- .../drivers/mozab/bootstrap/MNSINIParser.cxx | 2 +- .../drivers/mozab/bootstrap/MNSINIParser.hxx | 2 +- .../drivers/mozab/bootstrap/MNSProfileDiscover.cxx | 12 +- .../drivers/mozab/bootstrap/MNSProfileDiscover.hxx | 12 +- connectivity/source/drivers/mysql/YCatalog.cxx | 4 +- connectivity/source/drivers/mysql/YColumns.cxx | 2 +- connectivity/source/drivers/mysql/YDriver.cxx | 26 +- connectivity/source/drivers/mysql/YTable.cxx | 4 +- connectivity/source/drivers/mysql/YTables.cxx | 2 +- connectivity/source/drivers/mysql/YUser.cxx | 12 +- connectivity/source/drivers/mysql/YUsers.cxx | 2 +- connectivity/source/drivers/mysql/YViews.cxx | 2 +- connectivity/source/drivers/odbc/OConnection.cxx | 44 +- .../source/drivers/odbc/ODatabaseMetaData.cxx | 268 +++--- .../drivers/odbc/ODatabaseMetaDataResultSet.cxx | 133 ++- connectivity/source/drivers/odbc/ODriver.cxx | 19 +- .../source/drivers/odbc/OPreparedStatement.cxx | 74 +- connectivity/source/drivers/odbc/ORealDriver.cxx | 2 +- connectivity/source/drivers/odbc/ORealDriver.hxx | 3 +- connectivity/source/drivers/odbc/OResultSet.cxx | 180 ++-- .../source/drivers/odbc/OResultSetMetaData.cxx | 49 +- connectivity/source/drivers/odbc/OStatement.cxx | 49 +- connectivity/source/drivers/odbc/OTools.cxx | 18 +- .../source/drivers/postgresql/pq_array.cxx | 6 - .../source/drivers/postgresql/pq_array.hxx | 18 +- .../source/drivers/postgresql/pq_baseresultset.cxx | 71 +- .../source/drivers/postgresql/pq_baseresultset.hxx | 138 +-- .../source/drivers/postgresql/pq_connection.cxx | 45 +- .../source/drivers/postgresql/pq_connection.hxx | 75 +- .../drivers/postgresql/pq_databasemetadata.cxx | 295 ++++--- .../drivers/postgresql/pq_databasemetadata.hxx | 307 ++++--- .../source/drivers/postgresql/pq_driver.cxx | 29 +- .../source/drivers/postgresql/pq_driver.hxx | 28 +- .../postgresql/pq_fakedupdateableresultset.cxx | 49 +- .../postgresql/pq_fakedupdateableresultset.hxx | 55 +- .../drivers/postgresql/pq_preparedstatement.cxx | 49 +- .../drivers/postgresql/pq_preparedstatement.hxx | 128 +-- .../source/drivers/postgresql/pq_resultset.cxx | 6 +- .../source/drivers/postgresql/pq_resultset.hxx | 12 +- .../drivers/postgresql/pq_resultsetmetadata.cxx | 26 +- .../drivers/postgresql/pq_resultsetmetadata.hxx | 45 +- .../drivers/postgresql/pq_sequenceresultset.cxx | 5 - .../drivers/postgresql/pq_sequenceresultset.hxx | 12 +- .../postgresql/pq_sequenceresultsetmetadata.cxx | 26 +- .../postgresql/pq_sequenceresultsetmetadata.hxx | 45 +- .../source/drivers/postgresql/pq_statement.cxx | 27 +- .../source/drivers/postgresql/pq_statement.hxx | 59 +- .../source/drivers/postgresql/pq_tools.cxx | 2 +- .../source/drivers/postgresql/pq_tools.hxx | 3 +- .../drivers/postgresql/pq_updateableresultset.cxx | 50 +- .../drivers/postgresql/pq_updateableresultset.hxx | 58 +- .../source/drivers/postgresql/pq_xbase.cxx | 13 +- .../source/drivers/postgresql/pq_xbase.hxx | 33 +- .../source/drivers/postgresql/pq_xcolumn.cxx | 4 +- .../source/drivers/postgresql/pq_xcolumn.hxx | 4 +- .../source/drivers/postgresql/pq_xcolumns.cxx | 9 - .../source/drivers/postgresql/pq_xcolumns.hxx | 18 +- .../source/drivers/postgresql/pq_xcontainer.cxx | 36 +- .../source/drivers/postgresql/pq_xcontainer.hxx | 62 +- .../source/drivers/postgresql/pq_xindex.cxx | 20 +- .../source/drivers/postgresql/pq_xindex.hxx | 26 +- .../source/drivers/postgresql/pq_xindexcolumn.cxx | 4 +- .../source/drivers/postgresql/pq_xindexcolumn.hxx | 4 +- .../source/drivers/postgresql/pq_xindexcolumns.cxx | 12 - .../source/drivers/postgresql/pq_xindexcolumns.hxx | 23 +- .../source/drivers/postgresql/pq_xindexes.cxx | 9 - .../source/drivers/postgresql/pq_xindexes.hxx | 18 +- connectivity/source/drivers/postgresql/pq_xkey.cxx | 20 +- connectivity/source/drivers/postgresql/pq_xkey.hxx | 26 +- .../source/drivers/postgresql/pq_xkeycolumn.cxx | 4 +- .../source/drivers/postgresql/pq_xkeycolumn.hxx | 4 +- .../source/drivers/postgresql/pq_xkeycolumns.cxx | 9 - .../source/drivers/postgresql/pq_xkeycolumns.hxx | 18 +- .../source/drivers/postgresql/pq_xkeys.cxx | 9 - .../source/drivers/postgresql/pq_xkeys.hxx | 18 +- .../source/drivers/postgresql/pq_xtable.cxx | 37 +- .../source/drivers/postgresql/pq_xtable.hxx | 53 +- .../source/drivers/postgresql/pq_xtables.cxx | 8 - .../source/drivers/postgresql/pq_xtables.hxx | 15 +- .../source/drivers/postgresql/pq_xuser.cxx | 15 +- .../source/drivers/postgresql/pq_xuser.hxx | 23 +- .../source/drivers/postgresql/pq_xusers.cxx | 11 - .../source/drivers/postgresql/pq_xusers.hxx | 20 +- .../source/drivers/postgresql/pq_xview.cxx | 17 +- .../source/drivers/postgresql/pq_xview.hxx | 22 +- .../source/drivers/postgresql/pq_xviews.cxx | 11 - .../source/drivers/postgresql/pq_xviews.hxx | 20 +- .../source/inc/FDatabaseMetaDataResultSet.hxx | 108 +-- .../inc/FDatabaseMetaDataResultSetMetaData.hxx | 42 +- connectivity/source/inc/ParameterSubstitution.hxx | 18 +- connectivity/source/inc/TConnection.hxx | 2 +- connectivity/source/inc/TDatabaseMetaDataBase.hxx | 60 +- connectivity/source/inc/TPrivilegesResultSet.hxx | 2 +- connectivity/source/inc/ado/ACallableStatement.hxx | 46 +- connectivity/source/inc/ado/AColumn.hxx | 5 +- connectivity/source/inc/ado/AColumns.hxx | 2 +- connectivity/source/inc/ado/AConnection.hxx | 51 +- connectivity/source/inc/ado/ADatabaseMetaData.hxx | 274 +++--- .../source/inc/ado/ADatabaseMetaDataResultSet.hxx | 118 ++- .../inc/ado/ADatabaseMetaDataResultSetMetaData.hxx | 42 +- connectivity/source/inc/ado/ADriver.hxx | 28 +- connectivity/source/inc/ado/AGroup.hxx | 12 +- connectivity/source/inc/ado/AGroups.hxx | 2 +- connectivity/source/inc/ado/AIndex.hxx | 4 +- connectivity/source/inc/ado/AIndexes.hxx | 2 +- connectivity/source/inc/ado/AKey.hxx | 4 +- connectivity/source/inc/ado/AKeys.hxx | 2 +- connectivity/source/inc/ado/APreparedStatement.hxx | 65 +- connectivity/source/inc/ado/AResultSet.hxx | 182 ++-- connectivity/source/inc/ado/AResultSetMetaData.hxx | 42 +- connectivity/source/inc/ado/AStatement.hxx | 84 +- connectivity/source/inc/ado/ATable.hxx | 16 +- connectivity/source/inc/ado/ATables.hxx | 5 +- connectivity/source/inc/ado/AUser.hxx | 15 +- connectivity/source/inc/ado/AUsers.hxx | 2 +- connectivity/source/inc/ado/AView.hxx | 2 +- connectivity/source/inc/ado/AViews.hxx | 5 +- connectivity/source/inc/ado/adoimp.hxx | 4 +- connectivity/source/inc/calc/CConnection.hxx | 23 +- connectivity/source/inc/calc/CDatabaseMetaData.hxx | 16 +- connectivity/source/inc/calc/CDriver.hxx | 15 +- connectivity/source/inc/calc/CResultSet.hxx | 20 +- connectivity/source/inc/calc/CTable.hxx | 6 +- connectivity/source/inc/dbase/DColumns.hxx | 2 +- connectivity/source/inc/dbase/DConnection.hxx | 8 +- .../source/inc/dbase/DDatabaseMetaData.hxx | 26 +- connectivity/source/inc/dbase/DDriver.hxx | 12 +- connectivity/source/inc/dbase/DIndex.hxx | 2 +- connectivity/source/inc/dbase/DIndexColumns.hxx | 2 +- connectivity/source/inc/dbase/DIndexes.hxx | 2 +- connectivity/source/inc/dbase/DResultSet.hxx | 20 +- connectivity/source/inc/dbase/DTable.hxx | 14 +- connectivity/source/inc/dbase/DTables.hxx | 4 +- connectivity/source/inc/file/FCatalog.hxx | 4 +- connectivity/source/inc/file/FColumns.hxx | 2 +- connectivity/source/inc/file/FConnection.hxx | 50 +- connectivity/source/inc/file/FDatabaseMetaData.hxx | 244 +++--- connectivity/source/inc/file/FDriver.hxx | 24 +- .../source/inc/file/FPreparedStatement.hxx | 64 +- connectivity/source/inc/file/FResultSet.hxx | 151 ++-- .../source/inc/file/FResultSetMetaData.hxx | 44 +- connectivity/source/inc/file/FStatement.hxx | 28 +- connectivity/source/inc/file/FTable.hxx | 6 +- connectivity/source/inc/file/FTables.hxx | 4 +- connectivity/source/inc/file/fcomp.hxx | 14 +- connectivity/source/inc/flat/EConnection.hxx | 10 +- connectivity/source/inc/flat/EDatabaseMetaData.hxx | 4 +- connectivity/source/inc/flat/EDriver.hxx | 12 +- connectivity/source/inc/flat/EResultSet.hxx | 18 +- connectivity/source/inc/flat/ETable.hxx | 6 +- connectivity/source/inc/hsqldb/HCatalog.hxx | 4 +- connectivity/source/inc/hsqldb/HColumns.hxx | 2 +- connectivity/source/inc/hsqldb/HConnection.hxx | 10 +- connectivity/source/inc/hsqldb/HDriver.hxx | 32 +- connectivity/source/inc/hsqldb/HTable.hxx | 10 +- connectivity/source/inc/hsqldb/HTables.hxx | 2 +- connectivity/source/inc/hsqldb/HUser.hxx | 12 +- connectivity/source/inc/hsqldb/HUsers.hxx | 2 +- connectivity/source/inc/hsqldb/HView.hxx | 2 +- connectivity/source/inc/hsqldb/HViews.hxx | 2 +- connectivity/source/inc/java/io/InputStream.hxx | 10 +- connectivity/source/inc/java/io/Reader.hxx | 10 +- connectivity/source/inc/java/sql/Array.hxx | 12 +- connectivity/source/inc/java/sql/Blob.hxx | 10 +- .../source/inc/java/sql/CallableStatement.hxx | 48 +- connectivity/source/inc/java/sql/Clob.hxx | 10 +- connectivity/source/inc/java/sql/Connection.hxx | 42 +- .../source/inc/java/sql/DatabaseMetaData.hxx | 268 +++--- connectivity/source/inc/java/sql/Driver.hxx | 22 +- connectivity/source/inc/java/sql/JStatement.hxx | 76 +- .../source/inc/java/sql/PreparedStatement.hxx | 66 +- connectivity/source/inc/java/sql/Ref.hxx | 2 +- connectivity/source/inc/java/sql/ResultSet.hxx | 160 ++-- .../source/inc/java/sql/ResultSetMetaData.hxx | 42 +- connectivity/source/inc/java/tools.hxx | 2 +- connectivity/source/inc/mysql/YCatalog.hxx | 4 +- connectivity/source/inc/mysql/YColumns.hxx | 2 +- connectivity/source/inc/mysql/YDriver.hxx | 20 +- connectivity/source/inc/mysql/YTable.hxx | 4 +- connectivity/source/inc/mysql/YTables.hxx | 2 +- connectivity/source/inc/mysql/YUser.hxx | 12 +- connectivity/source/inc/mysql/YUsers.hxx | 2 +- connectivity/source/inc/mysql/YViews.hxx | 2 +- connectivity/source/inc/odbc/OConnection.hxx | 44 +- connectivity/source/inc/odbc/ODatabaseMetaData.hxx | 268 +++--- .../source/inc/odbc/ODatabaseMetaDataResultSet.hxx | 141 ++-- connectivity/source/inc/odbc/ODriver.hxx | 20 +- .../source/inc/odbc/OPreparedStatement.hxx | 78 +- connectivity/source/inc/odbc/OResultSet.hxx | 180 ++-- .../source/inc/odbc/OResultSetMetaData.hxx | 51 +- connectivity/source/inc/odbc/OStatement.hxx | 60 +- connectivity/source/inc/odbc/OTools.hxx | 22 +- connectivity/source/manager/mdrivermanager.cxx | 44 +- connectivity/source/manager/mdrivermanager.hxx | 34 +- connectivity/source/parse/PColumn.cxx | 2 +- connectivity/source/sdbcx/VCatalog.cxx | 8 +- connectivity/source/sdbcx/VCollection.cxx | 40 +- connectivity/source/sdbcx/VColumn.cxx | 18 +- connectivity/source/sdbcx/VDescriptor.cxx | 6 +- connectivity/source/sdbcx/VGroup.cxx | 20 +- connectivity/source/sdbcx/VIndex.cxx | 20 +- connectivity/source/sdbcx/VIndexColumn.cxx | 6 +- connectivity/source/sdbcx/VKey.cxx | 20 +- connectivity/source/sdbcx/VKeyColumn.cxx | 6 +- connectivity/source/sdbcx/VTable.cxx | 30 +- connectivity/source/sdbcx/VUser.cxx | 22 +- connectivity/source/sdbcx/VView.cxx | 10 +- cppcanvas/source/uno/uno_mtfrenderer.cxx | 6 +- cppcanvas/source/uno/uno_mtfrenderer.hxx | 8 +- cppu/qa/test_any.cxx | 9 +- cppu/qa/test_reference.cxx | 3 +- cppuhelper/qa/ifcontainer/cppu_ifcontainer.cxx | 3 +- cppuhelper/qa/weak/test_weak.cxx | 2 +- cppuhelper/source/component.cxx | 9 +- cppuhelper/source/component_context.cxx | 52 +- cppuhelper/source/exc_thrower.cxx | 12 +- cppuhelper/source/factory.cxx | 147 +--- cppuhelper/source/implbase.cxx | 9 - cppuhelper/source/macro_expander.cxx | 16 +- cppuhelper/source/propertysetmixin.cxx | 46 +- cppuhelper/source/propshlp.cxx | 44 +- cppuhelper/source/servicemanager.cxx | 91 +- cppuhelper/source/servicemanager.hxx | 93 +-- cppuhelper/source/tdmgr.cxx | 4 +- cppuhelper/source/typemanager.cxx | 361 ++++---- cppuhelper/source/typemanager.hxx | 41 +- cppuhelper/source/weak.cxx | 33 +- cpputools/source/unoexe/unoexe.cxx | 14 +- cui/source/dialogs/colorpicker.cxx | 34 +- cui/source/dialogs/thesdlg.cxx | 1 - cui/source/inc/colorpicker.hxx | 3 +- cui/source/inc/thesdlg.hxx | 2 +- cui/source/options/personasdochandler.cxx | 9 - cui/source/options/personasdochandler.hxx | 25 +- dbaccess/source/core/api/BookmarkSet.cxx | 16 +- dbaccess/source/core/api/BookmarkSet.hxx | 16 +- dbaccess/source/core/api/CRowSetColumn.cxx | 2 +- dbaccess/source/core/api/CRowSetColumn.hxx | 2 +- dbaccess/source/core/api/CRowSetDataColumn.cxx | 8 +- dbaccess/source/core/api/CRowSetDataColumn.hxx | 8 +- dbaccess/source/core/api/CacheSet.cxx | 76 +- dbaccess/source/core/api/CacheSet.hxx | 86 +- dbaccess/source/core/api/FilteredContainer.cxx | 2 +- dbaccess/source/core/api/HelperCollections.hxx | 4 +- dbaccess/source/core/api/KeySet.cxx | 88 +- dbaccess/source/core/api/KeySet.hxx | 92 +- dbaccess/source/core/api/OptimisticSet.cxx | 6 +- dbaccess/source/core/api/OptimisticSet.hxx | 6 +- dbaccess/source/core/api/PrivateRow.cxx | 40 +- dbaccess/source/core/api/PrivateRow.hxx | 40 +- dbaccess/source/core/api/RowSet.cxx | 210 ++--- dbaccess/source/core/api/RowSet.hxx | 214 ++--- dbaccess/source/core/api/RowSetBase.cxx | 108 +-- dbaccess/source/core/api/RowSetBase.hxx | 112 +-- .../source/core/api/SingleSelectQueryComposer.cxx | 55 +- dbaccess/source/core/api/StaticSet.cxx | 42 +- dbaccess/source/core/api/StaticSet.hxx | 42 +- dbaccess/source/core/api/TableDeco.cxx | 33 +- dbaccess/source/core/api/View.cxx | 6 +- dbaccess/source/core/api/WrappedResultSet.cxx | 16 +- dbaccess/source/core/api/WrappedResultSet.hxx | 16 +- dbaccess/source/core/api/callablestatement.cxx | 54 +- dbaccess/source/core/api/column.cxx | 30 +- dbaccess/source/core/api/datacolumn.cxx | 84 +- dbaccess/source/core/api/datacolumn.hxx | 84 +- dbaccess/source/core/api/definitioncolumn.cxx | 29 +- dbaccess/source/core/api/preparedstatement.cxx | 70 +- dbaccess/source/core/api/query.cxx | 13 +- dbaccess/source/core/api/query.hxx | 19 +- dbaccess/source/core/api/querycomposer.cxx | 38 +- dbaccess/source/core/api/querycontainer.cxx | 28 +- dbaccess/source/core/api/querydescriptor.cxx | 13 +- dbaccess/source/core/api/querydescriptor.hxx | 20 +- dbaccess/source/core/api/resultcolumn.cxx | 6 +- dbaccess/source/core/api/resultcolumn.hxx | 6 +- dbaccess/source/core/api/resultset.cxx | 164 ++-- dbaccess/source/core/api/resultset.hxx | 166 ++-- dbaccess/source/core/api/statement.cxx | 52 +- dbaccess/source/core/api/table.cxx | 15 +- dbaccess/source/core/api/tablecontainer.cxx | 8 +- dbaccess/source/core/api/viewcontainer.cxx | 8 +- .../source/core/dataaccess/ComponentDefinition.cxx | 17 +- .../source/core/dataaccess/ComponentDefinition.hxx | 18 +- dbaccess/source/core/dataaccess/ContentHelper.cxx | 32 +- dbaccess/source/core/dataaccess/ModelImpl.cxx | 30 +- dbaccess/source/core/dataaccess/ModelImpl.hxx | 2 +- .../source/core/dataaccess/SharedConnection.cxx | 26 +- .../source/core/dataaccess/SharedConnection.hxx | 44 +- .../source/core/dataaccess/bookmarkcontainer.cxx | 36 +- .../source/core/dataaccess/bookmarkcontainer.hxx | 36 +- .../source/core/dataaccess/commandcontainer.cxx | 5 +- .../source/core/dataaccess/commandcontainer.hxx | 10 +- .../source/core/dataaccess/commanddefinition.cxx | 7 +- .../source/core/dataaccess/commanddefinition.hxx | 41 +- dbaccess/source/core/dataaccess/connection.cxx | 92 +- dbaccess/source/core/dataaccess/connection.hxx | 94 +-- .../core/dataaccess/dataaccessdescriptor.cxx | 32 +- .../source/core/dataaccess/databasecontext.cxx | 69 +- .../source/core/dataaccess/databasecontext.hxx | 56 +- .../source/core/dataaccess/databasedocument.cxx | 153 ++-- .../source/core/dataaccess/databasedocument.hxx | 159 ++-- .../core/dataaccess/databaseregistrations.cxx | 36 +- dbaccess/source/core/dataaccess/datasource.cxx | 94 +-- dbaccess/source/core/dataaccess/datasource.hxx | 60 +- .../source/core/dataaccess/definitioncontainer.cxx | 43 +- .../source/core/dataaccess/documentcontainer.cxx | 35 +- .../source/core/dataaccess/documentcontainer.hxx | 40 +- .../source/core/dataaccess/documentdefinition.cxx | 54 +- .../source/core/dataaccess/documentdefinition.hxx | 34 +- .../core/dataaccess/documenteventexecutor.cxx | 4 +- .../core/dataaccess/documenteventexecutor.hxx | 4 +- dbaccess/source/core/dataaccess/documentevents.cxx | 12 +- dbaccess/source/core/dataaccess/documentevents.hxx | 12 +- dbaccess/source/core/dataaccess/intercept.cxx | 23 +- dbaccess/source/core/dataaccess/intercept.hxx | 50 +- .../source/core/dataaccess/myucp_datasupplier.cxx | 1 - .../source/core/dataaccess/myucp_datasupplier.hxx | 3 +- dbaccess/source/core/inc/ContainerMediator.hxx | 8 +- dbaccess/source/core/inc/ContentHelper.hxx | 40 +- dbaccess/source/core/inc/DatabaseDataProvider.hxx | 219 +++-- dbaccess/source/core/inc/FilteredContainer.hxx | 2 +- dbaccess/source/core/inc/PropertyForward.hxx | 4 +- .../source/core/inc/SingleSelectQueryComposer.hxx | 60 +- dbaccess/source/core/inc/TableDeco.hxx | 37 +- dbaccess/source/core/inc/View.hxx | 2 +- dbaccess/source/core/inc/callablestatement.hxx | 54 +- dbaccess/source/core/inc/column.hxx | 34 +- dbaccess/source/core/inc/definitioncolumn.hxx | 44 +- dbaccess/source/core/inc/definitioncontainer.hxx | 48 +- dbaccess/source/core/inc/preparedstatement.hxx | 70 +- dbaccess/source/core/inc/querycomposer.hxx | 39 +- dbaccess/source/core/inc/querycontainer.hxx | 28 +- dbaccess/source/core/inc/statement.hxx | 56 +- dbaccess/source/core/inc/table.hxx | 18 +- dbaccess/source/core/inc/tablecontainer.hxx | 8 +- dbaccess/source/core/inc/veto.hxx | 4 +- dbaccess/source/core/inc/viewcontainer.hxx | 8 +- dbaccess/source/core/misc/ContainerMediator.cxx | 8 +- dbaccess/source/core/misc/DatabaseDataProvider.cxx | 217 +++-- dbaccess/source/core/misc/PropertyForward.cxx | 4 +- dbaccess/source/core/misc/apitools.cxx | 4 +- dbaccess/source/core/misc/veto.cxx | 4 +- .../source/core/recovery/subcomponentloader.cxx | 10 +- .../source/core/recovery/subcomponentloader.hxx | 10 +- .../source/core/recovery/subcomponentrecovery.cxx | 32 +- .../ext/macromigration/macromigrationwizard.cxx | 28 +- .../source/ext/macromigration/progresscapture.cxx | 10 +- .../source/ext/macromigration/progresscapture.hxx | 10 +- dbaccess/source/filter/xml/dbloader2.cxx | 36 +- dbaccess/source/filter/xml/xmlExport.cxx | 20 +- dbaccess/source/filter/xml/xmlExport.hxx | 7 +- dbaccess/source/filter/xml/xmlfilter.cxx | 4 - dbaccess/source/filter/xml/xmlfilter.hxx | 9 +- .../source/inc/OAuthenticationContinuation.hxx | 24 +- dbaccess/source/inc/apitools.hxx | 37 +- .../source/sdbtools/connection/connectiontools.cxx | 18 +- .../source/sdbtools/connection/connectiontools.hxx | 18 +- .../sdbtools/connection/datasourcemetadata.cxx | 2 +- .../sdbtools/connection/datasourcemetadata.hxx | 2 +- .../source/sdbtools/connection/objectnames.cxx | 10 +- .../source/sdbtools/connection/objectnames.hxx | 10 +- dbaccess/source/sdbtools/connection/tablename.cxx | 22 +- dbaccess/source/sdbtools/connection/tablename.hxx | 22 +- dbaccess/source/ui/app/AppController.cxx | 32 +- dbaccess/source/ui/app/AppController.hxx | 62 +- dbaccess/source/ui/app/AppControllerGen.cxx | 30 +- dbaccess/source/ui/app/subcomponentmanager.cxx | 4 +- dbaccess/source/ui/app/subcomponentmanager.hxx | 4 +- dbaccess/source/ui/browser/brwctrlr.cxx | 238 +++--- dbaccess/source/ui/browser/dbexchange.cxx | 2 +- dbaccess/source/ui/browser/dbloader.cxx | 20 +- dbaccess/source/ui/browser/exsrcbrw.cxx | 24 +- dbaccess/source/ui/browser/formadapter.cxx | 324 ++++---- dbaccess/source/ui/browser/genericcontroller.cxx | 72 +- dbaccess/source/ui/browser/sbagrid.cxx | 40 +- dbaccess/source/ui/browser/sbamultiplex.cxx | 8 +- dbaccess/source/ui/browser/unodatbr.cxx | 52 +- dbaccess/source/ui/control/dbtreelistbox.cxx | 16 +- dbaccess/source/ui/control/sqledit.cxx | 6 +- dbaccess/source/ui/control/tabletree.cxx | 2 +- dbaccess/source/ui/dlg/adtabdlg.cxx | 24 +- dbaccess/source/ui/dlg/dbwizsetup.cxx | 12 +- dbaccess/source/ui/dlg/finteraction.cxx | 2 +- dbaccess/source/ui/dlg/finteraction.hxx | 2 +- dbaccess/source/ui/inc/ConnectionLineAccess.hxx | 38 +- dbaccess/source/ui/inc/JAccess.hxx | 10 +- dbaccess/source/ui/inc/JoinController.hxx | 2 +- dbaccess/source/ui/inc/JoinExchange.hxx | 4 +- dbaccess/source/ui/inc/RelationController.hxx | 8 +- dbaccess/source/ui/inc/RelationTableView.hxx | 6 +- dbaccess/source/ui/inc/TableController.hxx | 16 +- dbaccess/source/ui/inc/TableWindow.hxx | 6 +- dbaccess/source/ui/inc/TableWindowAccess.hxx | 34 +- dbaccess/source/ui/inc/TokenWriter.hxx | 2 +- dbaccess/source/ui/inc/brwctrlr.hxx | 50 +- dbaccess/source/ui/inc/dbexchange.hxx | 2 +- dbaccess/source/ui/inc/exsrcbrw.hxx | 24 +- dbaccess/source/ui/inc/formadapter.hxx | 356 ++++---- dbaccess/source/ui/inc/querycontroller.hxx | 16 +- dbaccess/source/ui/inc/sbagrid.hxx | 40 +- dbaccess/source/ui/inc/sbamultiplex.hxx | 44 +- dbaccess/source/ui/inc/singledoccontroller.hxx | 2 +- dbaccess/source/ui/inc/tabletree.hxx | 2 +- dbaccess/source/ui/inc/unodatbr.hxx | 52 +- dbaccess/source/ui/inc/unosqlmessage.hxx | 16 +- dbaccess/source/ui/misc/TokenWriter.cxx | 2 +- dbaccess/source/ui/misc/controllerframe.cxx | 32 +- dbaccess/source/ui/misc/dbaundomanager.cxx | 44 +- .../source/ui/misc/dbsubcomponentcontroller.cxx | 21 +- dbaccess/source/ui/misc/singledoccontroller.cxx | 2 +- .../source/ui/querydesign/ConnectionLineAccess.cxx | 38 +- dbaccess/source/ui/querydesign/JAccess.cxx | 10 +- dbaccess/source/ui/querydesign/JoinController.cxx | 2 +- dbaccess/source/ui/querydesign/JoinExchange.cxx | 4 +- dbaccess/source/ui/querydesign/TableWindow.cxx | 6 +- .../source/ui/querydesign/TableWindowAccess.cxx | 34 +- .../source/ui/querydesign/limitboxcontroller.cxx | 8 - .../source/ui/querydesign/limitboxcontroller.hxx | 20 +- dbaccess/source/ui/querydesign/querycontroller.cxx | 24 +- .../ui/relationdesign/RelationController.cxx | 8 +- .../source/ui/relationdesign/RelationTableView.cxx | 6 +- dbaccess/source/ui/tabledesign/TableController.cxx | 14 +- dbaccess/source/ui/uno/AdvancedSettingsDlg.cxx | 24 +- dbaccess/source/ui/uno/ColumnControl.cxx | 2 +- dbaccess/source/ui/uno/ColumnControl.hxx | 6 +- dbaccess/source/ui/uno/ColumnModel.cxx | 13 +- dbaccess/source/ui/uno/ColumnModel.hxx | 20 +- dbaccess/source/ui/uno/ColumnPeer.cxx | 4 +- dbaccess/source/ui/uno/ColumnPeer.hxx | 4 +- dbaccess/source/ui/uno/DBTypeWizDlg.cxx | 12 +- dbaccess/source/ui/uno/DBTypeWizDlg.hxx | 12 +- dbaccess/source/ui/uno/DBTypeWizDlgSetup.cxx | 12 +- dbaccess/source/ui/uno/DBTypeWizDlgSetup.hxx | 12 +- dbaccess/source/ui/uno/TableFilterDlg.cxx | 12 +- dbaccess/source/ui/uno/TableFilterDlg.hxx | 12 +- dbaccess/source/ui/uno/UserSettingsDlg.cxx | 12 +- dbaccess/source/ui/uno/UserSettingsDlg.hxx | 12 +- dbaccess/source/ui/uno/admindlg.cxx | 12 +- dbaccess/source/ui/uno/admindlg.hxx | 12 +- dbaccess/source/ui/uno/composerdialogs.cxx | 5 +- dbaccess/source/ui/uno/composerdialogs.hxx | 17 +- dbaccess/source/ui/uno/copytablewizard.cxx | 72 +- dbaccess/source/ui/uno/dbinteraction.cxx | 4 +- dbaccess/source/ui/uno/dbinteraction.hxx | 12 +- .../source/ui/uno/textconnectionsettings_uno.cxx | 34 +- dbaccess/source/ui/uno/unoDirectSql.cxx | 1 - dbaccess/source/ui/uno/unoDirectSql.hxx | 7 +- dbaccess/source/ui/uno/unosqlmessage.cxx | 16 +- desktop/source/app/check_ext_deps.cxx | 22 +- desktop/source/app/desktopcontext.cxx | 2 +- desktop/source/app/desktopcontext.hxx | 3 +- desktop/source/app/dispatchwatcher.cxx | 3 +- desktop/source/app/dispatchwatcher.hxx | 5 +- desktop/source/app/officeipcthread.cxx | 7 +- desktop/source/app/officeipcthread.hxx | 18 +- desktop/source/deployment/dp_log.cxx | 10 +- desktop/source/deployment/gui/dp_gui_dialog2.cxx | 4 +- desktop/source/deployment/gui/dp_gui_dialog2.hxx | 4 +- .../deployment/gui/dp_gui_extensioncmdqueue.cxx | 26 +- .../source/deployment/gui/dp_gui_extlistbox.cxx | 1 - .../source/deployment/gui/dp_gui_extlistbox.hxx | 3 +- desktop/source/deployment/gui/dp_gui_service.cxx | 13 +- desktop/source/deployment/gui/dp_gui_theextmgr.cxx | 4 - desktop/source/deployment/gui/dp_gui_theextmgr.hxx | 12 +- .../deployment/gui/dp_gui_updateinstalldialog.cxx | 22 +- desktop/source/deployment/gui/license_dialog.cxx | 4 +- desktop/source/deployment/gui/license_dialog.hxx | 5 +- desktop/source/deployment/inc/dp_interact.h | 2 +- .../deployment/manager/dp_commandenvironments.cxx | 11 +- .../deployment/manager/dp_commandenvironments.hxx | 27 +- .../deployment/manager/dp_extensionmanager.cxx | 65 -- .../deployment/manager/dp_extensionmanager.hxx | 106 +-- .../deployment/manager/dp_informationprovider.cxx | 12 +- desktop/source/deployment/manager/dp_manager.cxx | 48 +- desktop/source/deployment/manager/dp_manager.h | 94 +-- .../source/deployment/manager/dp_managerfac.cxx | 3 +- .../deployment/misc/dp_descriptioninfoset.cxx | 19 +- desktop/source/deployment/misc/dp_interact.cxx | 10 +- .../deployment/registry/component/dp_component.cxx | 10 +- .../registry/configuration/dp_configuration.cxx | 10 +- desktop/source/deployment/registry/dp_backend.cxx | 81 +- desktop/source/deployment/registry/dp_registry.cxx | 23 +- .../registry/executable/dp_executable.cxx | 10 +- .../source/deployment/registry/help/dp_help.cxx | 17 +- .../source/deployment/registry/inc/dp_backend.h | 141 +--- .../deployment/registry/package/dp_package.cxx | 116 +-- .../deployment/registry/script/dp_script.cxx | 14 +- .../deployment/registry/sfwk/dp_parceldesc.cxx | 9 - .../deployment/registry/sfwk/dp_parceldesc.hxx | 25 +- .../source/deployment/registry/sfwk/dp_sfwk.cxx | 22 +- desktop/source/lib/init.cxx | 4 +- desktop/source/lib/lokclipboard.cxx | 7 +- desktop/source/lib/lokclipboard.hxx | 17 +- desktop/source/lib/lokinteractionhandler.cxx | 11 +- desktop/source/lib/lokinteractionhandler.hxx | 18 +- .../source/migration/services/basicmigration.cxx | 8 +- .../source/migration/services/basicmigration.hxx | 16 +- desktop/source/migration/services/jvmfwk.cxx | 122 +-- .../migration/services/oo3extensionmigration.cxx | 15 +- .../migration/services/oo3extensionmigration.hxx | 31 +- .../migration/services/wordbookmigration.cxx | 8 +- .../migration/services/wordbookmigration.hxx | 16 +- desktop/source/offacc/acceptor.cxx | 5 - desktop/source/offacc/acceptor.hxx | 15 +- desktop/source/pkgchk/unopkg/unopkg_app.cxx | 8 +- desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx | 25 +- desktop/source/splash/splash.cxx | 28 +- desktop/source/splash/unxsplash.cxx | 11 +- desktop/source/splash/unxsplash.hxx | 23 +- .../drawinglayeruno/xprimitive2drenderer.cxx | 16 +- .../source/primitive2d/baseprimitive2d.cxx | 5 +- .../source/primitive2d/bitmapprimitive2d.cxx | 1 - .../source/primitive2d/groupprimitive2d.cxx | 1 - .../source/primitive2d/patternfillprimitive2d.cxx | 1 - .../source/primitive3d/baseprimitive3d.cxx | 4 +- dtrans/source/cnttype/mcnttfactory.cxx | 4 - dtrans/source/cnttype/mcnttfactory.hxx | 12 +- dtrans/source/cnttype/mcnttype.cxx | 14 +- dtrans/source/cnttype/mcnttype.hxx | 17 +- dtrans/source/generic/clipboardmanager.cxx | 9 - dtrans/source/generic/clipboardmanager.hxx | 30 +- dtrans/source/generic/generic_clipboard.cxx | 10 - dtrans/source/generic/generic_clipboard.hxx | 30 +- dtrans/source/win32/clipb/WinClipbImpl.cxx | 11 +- dtrans/source/win32/clipb/WinClipbImpl.hxx | 20 +- dtrans/source/win32/clipb/WinClipboard.cxx | 14 +- dtrans/source/win32/clipb/WinClipboard.hxx | 28 +- dtrans/source/win32/dnd/source.cxx | 11 +- dtrans/source/win32/dnd/source.hxx | 17 +- dtrans/source/win32/dnd/sourcecontext.cxx | 6 - dtrans/source/win32/dnd/sourcecontext.hxx | 20 +- dtrans/source/win32/dnd/target.cxx | 17 +- dtrans/source/win32/dnd/target.hxx | 23 +- dtrans/source/win32/dnd/targetdragcontext.cxx | 2 - dtrans/source/win32/dnd/targetdragcontext.hxx | 6 +- dtrans/source/win32/dnd/targetdropcontext.cxx | 3 - dtrans/source/win32/dnd/targetdropcontext.hxx | 9 +- dtrans/source/win32/dtobj/DOTransferable.cxx | 4 - dtrans/source/win32/dtobj/DOTransferable.hxx | 12 +- dtrans/source/win32/dtobj/XTDataObject.cxx | 3 +- dtrans/source/win32/ftransl/ftransl.cxx | 5 - dtrans/source/win32/ftransl/ftransl.hxx | 15 +- .../accessibility/AccessibleComponentBase.cxx | 13 - .../source/accessibility/AccessibleContextBase.cxx | 24 - .../accessibility/AccessibleEditableTextPara.cxx | 117 ++- .../source/accessibility/AccessibleHyperlink.cxx | 18 +- .../source/accessibility/AccessibleHyperlink.hxx | 18 +- .../source/accessibility/AccessibleImageBullet.cxx | 50 +- .../accessibility/AccessibleSelectionBase.cxx | 14 +- .../accessibility/AccessibleStaticTextBase.cxx | 44 +- editeng/source/editeng/eeobj.cxx | 8 +- editeng/source/editeng/eeobj.hxx | 8 +- editeng/source/editeng/impedit.cxx | 12 +- editeng/source/editeng/impedit.hxx | 20 +- editeng/source/misc/SvXMLAutoCorrectImport.cxx | 2 - editeng/source/misc/SvXMLAutoCorrectImport.hxx | 6 +- .../source/misc/SvXMLAutoCorrectTokenHandler.cxx | 2 - .../source/misc/SvXMLAutoCorrectTokenHandler.hxx | 6 +- editeng/source/misc/unolingu.cxx | 64 +- editeng/source/uno/UnoForbiddenCharsTable.cxx | 6 - editeng/source/uno/unofield.cxx | 30 +- editeng/source/uno/unonrule.cxx | 25 +- editeng/source/uno/unopracc.cxx | 10 +- editeng/source/uno/unotext.cxx | 105 +-- editeng/source/uno/unotext2.cxx | 58 +- editeng/source/xml/xmltxtexp.cxx | 73 +- embeddedobj/source/commonembedding/embedobj.cxx | 33 +- embeddedobj/source/commonembedding/inplaceobj.cxx | 8 - embeddedobj/source/commonembedding/miscobj.cxx | 14 - embeddedobj/source/commonembedding/persistence.cxx | 45 +- .../source/commonembedding/specialobject.cxx | 24 - embeddedobj/source/commonembedding/visobj.cxx | 14 - embeddedobj/source/commonembedding/xfactory.cxx | 36 - embeddedobj/source/commonembedding/xfactory.hxx | 26 +- embeddedobj/source/general/docholder.cxx | 16 +- embeddedobj/source/general/dummyobject.cxx | 87 -- embeddedobj/source/general/intercept.cxx | 28 - embeddedobj/source/general/xcreator.cxx | 24 - embeddedobj/source/inc/closepreventer.hxx | 6 +- embeddedobj/source/inc/commonembobj.hxx | 205 ++--- embeddedobj/source/inc/docholder.hxx | 30 +- embeddedobj/source/inc/dummyobject.hxx | 165 +--- embeddedobj/source/inc/intercept.hxx | 48 +- embeddedobj/source/inc/oleembobj.hxx | 222 ++--- embeddedobj/source/inc/specialobject.hxx | 38 +- embeddedobj/source/inc/xcreator.hxx | 16 +- embeddedobj/source/msole/closepreventer.cxx | 3 - embeddedobj/source/msole/graphconvert.cxx | 2 +- embeddedobj/source/msole/mtnotification.hxx | 3 +- embeddedobj/source/msole/olecomponent.cxx | 22 +- embeddedobj/source/msole/olecomponent.hxx | 29 +- embeddedobj/source/msole/oleembed.cxx | 27 - embeddedobj/source/msole/olemisc.cxx | 25 +- embeddedobj/source/msole/olepersist.cxx | 52 -- embeddedobj/source/msole/olepersist.hxx | 3 +- embeddedobj/source/msole/olevisual.cxx | 15 - embeddedobj/source/msole/ownview.cxx | 9 +- embeddedobj/source/msole/ownview.hxx | 8 +- embeddedobj/source/msole/xdialogcreator.cxx | 11 - embeddedobj/source/msole/xdialogcreator.hxx | 10 +- embeddedobj/source/msole/xolefactory.cxx | 24 - embeddedobj/source/msole/xolefactory.hxx | 16 +- embedserv/source/embed/docholder.cxx | 19 - embedserv/source/embed/intercept.cxx | 31 - embedserv/source/embed/register.cxx | 3 +- embedserv/source/embed/servprov.cxx | 3 - embedserv/source/inc/docholder.hxx | 39 +- embedserv/source/inc/intercept.hxx | 59 +- embedserv/source/inc/servprov.hxx | 9 +- eventattacher/source/eventattacher.cxx | 83 +- extensions/source/abpilot/unodialogabp.cxx | 16 +- extensions/source/abpilot/unodialogabp.hxx | 16 +- extensions/source/bibliography/bibload.cxx | 69 +- extensions/source/bibliography/datman.cxx | 28 +- extensions/source/bibliography/datman.hxx | 30 +- extensions/source/bibliography/framectr.cxx | 44 +- extensions/source/bibliography/framectr.hxx | 44 +- extensions/source/bibliography/general.cxx | 22 +- extensions/source/bibliography/general.hxx | 10 +- .../source/bibliography/loadlisteneradapter.cxx | 14 +- .../source/bibliography/loadlisteneradapter.hxx | 14 +- extensions/source/bibliography/toolbar.cxx | 9 +- extensions/source/bibliography/toolbar.hxx | 18 +- extensions/source/config/ldap/ldapaccess.cxx | 7 - extensions/source/config/ldap/ldapaccess.hxx | 21 +- .../source/config/ldap/ldapuserprofilebe.cxx | 10 - .../source/config/ldap/ldapuserprofilebe.hxx | 43 +- extensions/source/dbpilots/unoautopilot.hxx | 12 +- extensions/source/logging/consolehandler.cxx | 52 +- extensions/source/logging/csvformatter.cxx | 70 +- extensions/source/logging/filehandler.cxx | 44 +- extensions/source/logging/logger.cxx | 52 +- extensions/source/logging/plaintextformatter.cxx | 24 +- extensions/source/ole/oleobjw.cxx | 18 +- extensions/source/ole/oleobjw.hxx | 41 +- extensions/source/ole/servprov.cxx | 18 +- extensions/source/ole/servprov.hxx | 56 +- extensions/source/ole/servreg.cxx | 4 - extensions/source/ole/unoobjw.cxx | 2 - extensions/source/ole/unoobjw.hxx | 5 +- .../source/propctrlr/MasterDetailLinkDialog.cxx | 12 +- .../source/propctrlr/MasterDetailLinkDialog.hxx | 12 +- extensions/source/propctrlr/browserlistbox.cxx | 18 +- extensions/source/propctrlr/browserlistbox.hxx | 6 +- .../source/propctrlr/buttonnavigationhandler.cxx | 20 +- .../source/propctrlr/buttonnavigationhandler.hxx | 20 +- extensions/source/propctrlr/cellbindinghandler.cxx | 16 +- extensions/source/propctrlr/cellbindinghandler.hxx | 16 +- extensions/source/propctrlr/commoncontrol.cxx | 4 +- extensions/source/propctrlr/commoncontrol.hxx | 22 +- extensions/source/propctrlr/composeduiupdate.cxx | 40 +- extensions/source/propctrlr/composeduiupdate.hxx | 2 +- extensions/source/propctrlr/controlfontdialog.cxx | 14 +- extensions/source/propctrlr/controlfontdialog.hxx | 14 +- .../source/propctrlr/defaultforminspection.cxx | 16 +- .../source/propctrlr/defaultforminspection.hxx | 16 +- .../source/propctrlr/defaulthelpprovider.cxx | 10 +- .../source/propctrlr/defaulthelpprovider.hxx | 10 +- .../source/propctrlr/editpropertyhandler.cxx | 14 +- .../source/propctrlr/editpropertyhandler.hxx | 14 +- .../source/propctrlr/eformspropertyhandler.cxx | 25 +- .../source/propctrlr/eformspropertyhandler.hxx | 26 +- extensions/source/propctrlr/eventhandler.cxx | 65 +- extensions/source/propctrlr/eventhandler.hxx | 42 +- .../source/propctrlr/formcomponenthandler.cxx | 31 +- .../source/propctrlr/formcomponenthandler.hxx | 32 +- extensions/source/propctrlr/formcontroller.cxx | 20 +- extensions/source/propctrlr/formcontroller.hxx | 18 +- .../source/propctrlr/formgeometryhandler.cxx | 43 +- .../source/propctrlr/genericpropertyhandler.cxx | 48 +- .../source/propctrlr/genericpropertyhandler.hxx | 42 +- extensions/source/propctrlr/handlerhelper.cxx | 2 +- extensions/source/propctrlr/handlerhelper.hxx | 2 +- extensions/source/propctrlr/inspectormodelbase.cxx | 18 +- extensions/source/propctrlr/inspectormodelbase.hxx | 18 +- .../source/propctrlr/objectinspectormodel.cxx | 32 +- extensions/source/propctrlr/pcrcommon.hxx | 12 +- extensions/source/propctrlr/pcrunodialogs.cxx | 14 +- extensions/source/propctrlr/pcrunodialogs.hxx | 14 +- extensions/source/propctrlr/propcontroller.cxx | 84 +- extensions/source/propctrlr/propcontroller.hxx | 82 +- extensions/source/propctrlr/propertycomposer.cxx | 37 +- extensions/source/propctrlr/propertycomposer.hxx | 38 +- .../source/propctrlr/propertycontrolextender.cxx | 6 +- .../source/propctrlr/propertycontrolextender.hxx | 6 +- extensions/source/propctrlr/propertyhandler.cxx | 29 +- extensions/source/propctrlr/propertyhandler.hxx | 42 +- .../source/propctrlr/propeventtranslation.cxx | 4 +- .../source/propctrlr/propeventtranslation.hxx | 4 +- extensions/source/propctrlr/sqlcommanddesign.cxx | 4 +- extensions/source/propctrlr/sqlcommanddesign.hxx | 4 +- extensions/source/propctrlr/standardcontrol.cxx | 100 +-- extensions/source/propctrlr/standardcontrol.hxx | 100 +-- .../source/propctrlr/stringrepresentation.cxx | 24 +- extensions/source/propctrlr/submissionhandler.cxx | 21 +- extensions/source/propctrlr/submissionhandler.hxx | 22 +- extensions/source/propctrlr/taborder.cxx | 16 +- extensions/source/propctrlr/usercontrol.cxx | 20 +- extensions/source/propctrlr/usercontrol.hxx | 20 +- .../propctrlr/xsdvalidationpropertyhandler.cxx | 21 +- .../propctrlr/xsdvalidationpropertyhandler.hxx | 22 +- extensions/source/resource/ResourceIndexAccess.cxx | 12 +- extensions/source/resource/ResourceIndexAccess.hxx | 10 +- extensions/source/resource/oooresourceloader.cxx | 40 +- extensions/source/resource/oooresourceloader.hxx | 4 +- extensions/source/scanner/sane.hxx | 6 +- extensions/source/scanner/scanner.cxx | 8 +- extensions/source/scanner/scanner.hxx | 29 +- extensions/source/scanner/scanunx.cxx | 17 +- extensions/source/scanner/scanwin.cxx | 22 +- extensions/source/update/check/updatecheck.cxx | 4 +- .../source/update/check/updatecheckconfig.cxx | 21 +- .../source/update/check/updatecheckconfig.hxx | 43 +- extensions/source/update/check/updatecheckjob.cxx | 31 +- extensions/source/update/check/updatehdl.cxx | 12 - extensions/source/update/check/updatehdl.hxx | 25 +- extensions/source/update/feed/updatefeed.cxx | 57 +- extensions/source/update/ui/updatecheckui.cxx | 53 +- filter/qa/cppunit/xslt-test.cxx | 2 +- filter/source/config/cache/basecontainer.cxx | 27 - filter/source/config/cache/basecontainer.hxx | 61 +- filter/source/config/cache/cacheupdatelistener.cxx | 2 - filter/source/config/cache/cacheupdatelistener.hxx | 6 +- filter/source/config/cache/configflush.cxx | 6 - filter/source/config/cache/configflush.hxx | 18 +- .../source/config/cache/contenthandlerfactory.cxx | 5 - .../source/config/cache/contenthandlerfactory.hxx | 25 +- filter/source/config/cache/filtercache.cxx | 27 - filter/source/config/cache/filtercache.hxx | 81 +- filter/source/config/cache/filterfactory.cxx | 6 - filter/source/config/cache/filterfactory.hxx | 14 +- filter/source/config/cache/frameloaderfactory.cxx | 5 - filter/source/config/cache/frameloaderfactory.hxx | 25 +- filter/source/config/cache/typedetection.cxx | 3 - filter/source/config/cache/typedetection.hxx | 9 +- filter/source/flash/swfdialog.cxx | 11 - filter/source/flash/swfdialog.hxx | 16 +- filter/source/flash/swffilter.cxx | 36 +- filter/source/flash/swfuno.hxx | 16 +- filter/source/graphic/GraphicExportDialog.cxx | 10 +- filter/source/graphic/GraphicExportDialog.hxx | 15 +- filter/source/graphic/GraphicExportFilter.cxx | 5 +- filter/source/graphic/GraphicExportFilter.hxx | 8 +- filter/source/msfilter/msvbahelper.cxx | 20 +- filter/source/odfflatxml/OdfFlatXml.cxx | 18 +- filter/source/pdf/pdfdialog.cxx | 10 - filter/source/pdf/pdfdialog.hxx | 21 +- filter/source/pdf/pdfexport.cxx | 8 +- filter/source/pdf/pdffilter.cxx | 14 +- filter/source/pdf/pdffilter.hxx | 27 +- filter/source/pdf/pdfinteract.cxx | 11 +- filter/source/pdf/pdfinteract.hxx | 23 +- filter/source/placeware/exporter.cxx | 4 +- filter/source/placeware/filter.cxx | 24 +- filter/source/placeware/filter.hxx | 9 +- filter/source/storagefilterdetect/filterdetect.cxx | 7 +- filter/source/storagefilterdetect/filterdetect.hxx | 15 +- filter/source/svg/svgdialog.cxx | 11 - filter/source/svg/svgdialog.hxx | 29 +- filter/source/svg/svgexport.cxx | 1 - filter/source/svg/svgfilter.cxx | 7 +- filter/source/svg/svgfilter.hxx | 14 +- filter/source/svg/svgimport.cxx | 1 - filter/source/svg/svgwriter.cxx | 2 +- filter/source/svg/svgwriter.hxx | 3 +- filter/source/svg/test/odfserializer.cxx | 32 +- filter/source/svg/test/svg2odf.cxx | 6 +- filter/source/t602/t602filter.cxx | 25 +- filter/source/t602/t602filter.hxx | 97 +-- filter/source/textfilterdetect/filterdetect.cxx | 6 +- filter/source/textfilterdetect/filterdetect.hxx | 15 +- .../source/xmlfilteradaptor/XmlFilterAdaptor.cxx | 13 - .../source/xmlfilteradaptor/XmlFilterAdaptor.hxx | 49 +- filter/source/xmlfilterdetect/filterdetect.cxx | 6 +- filter/source/xmlfilterdetect/filterdetect.hxx | 15 +- filter/source/xsltdialog/typedetectionimport.cxx | 8 - filter/source/xsltdialog/typedetectionimport.hxx | 24 +- .../source/xsltdialog/xmlfilterdialogcomponent.cxx | 58 +- filter/source/xsltdialog/xmlfilterjar.cxx | 6 +- filter/source/xsltdialog/xmlfilterjar.hxx | 2 +- filter/source/xsltdialog/xmlfiltertestdialog.cxx | 8 +- filter/source/xsltfilter/LibXSLTTransformer.cxx | 13 +- filter/source/xsltfilter/LibXSLTTransformer.hxx | 22 +- filter/source/xsltfilter/XSLTFilter.cxx | 36 +- forms/source/component/Button.cxx | 46 +- forms/source/component/Button.hxx | 56 +- forms/source/component/CheckBox.cxx | 9 +- forms/source/component/CheckBox.hxx | 18 +- forms/source/component/Columns.cxx | 15 +- forms/source/component/Columns.hxx | 21 +- forms/source/component/ComboBox.cxx | 17 +- forms/source/component/ComboBox.hxx | 30 +- forms/source/component/Currency.cxx | 6 +- forms/source/component/Currency.hxx | 14 +- forms/source/component/DatabaseForm.cxx | 238 +++--- forms/source/component/DatabaseForm.hxx | 247 +++--- forms/source/component/Date.cxx | 10 +- forms/source/component/Date.hxx | 19 +- forms/source/component/Edit.cxx | 28 +- forms/source/component/Edit.hxx | 36 +- forms/source/component/EditBase.cxx | 7 +- forms/source/component/EditBase.hxx | 9 +- forms/source/component/EventThread.cxx | 4 +- forms/source/component/EventThread.hxx | 4 +- forms/source/component/File.cxx | 19 +- forms/source/component/File.hxx | 26 +- forms/source/component/Filter.cxx | 48 +- forms/source/component/Filter.hxx | 52 +- forms/source/component/FixedText.cxx | 7 +- forms/source/component/FixedText.hxx | 13 +- forms/source/component/FormComponent.cxx | 144 ++-- forms/source/component/FormattedField.cxx | 28 +- forms/source/component/FormattedField.hxx | 36 +- forms/source/component/FormattedFieldWrapper.cxx | 16 +- forms/source/component/FormattedFieldWrapper.hxx | 16 +- forms/source/component/FormsCollection.cxx | 20 +- forms/source/component/FormsCollection.hxx | 113 +-- forms/source/component/Grid.cxx | 49 +- forms/source/component/Grid.hxx | 54 +- forms/source/component/GroupBox.cxx | 9 +- forms/source/component/GroupBox.hxx | 18 +- forms/source/component/GroupManager.cxx | 10 +- forms/source/component/GroupManager.hxx | 10 +- forms/source/component/Hidden.cxx | 10 +- forms/source/component/Hidden.hxx | 19 +- forms/source/component/ImageButton.cxx | 20 +- forms/source/component/ImageButton.hxx | 30 +- forms/source/component/ImageControl.cxx | 39 +- forms/source/component/ImageControl.hxx | 49 +- forms/source/component/ListBox.cxx | 78 +- forms/source/component/ListBox.hxx | 90 +- forms/source/component/Numeric.cxx | 6 +- forms/source/component/Numeric.hxx | 14 +- forms/source/component/Pattern.cxx | 6 +- forms/source/component/Pattern.hxx | 14 +- forms/source/component/RadioButton.cxx | 13 +- forms/source/component/RadioButton.hxx | 23 +- forms/source/component/Time.cxx | 10 +- forms/source/component/Time.hxx | 19 +- forms/source/component/clickableimage.cxx | 38 +- forms/source/component/clickableimage.hxx | 45 +- forms/source/component/entrylisthelper.cxx | 18 +- forms/source/component/entrylisthelper.hxx | 20 +- forms/source/component/errorbroadcaster.cxx | 4 +- forms/source/component/errorbroadcaster.hxx | 4 +- forms/source/component/formcontrolfont.cxx | 6 +- forms/source/component/imgprod.cxx | 10 +- forms/source/component/imgprod.hxx | 12 +- forms/source/component/navigationbar.cxx | 16 +- forms/source/component/navigationbar.hxx | 19 +- forms/source/component/refvaluecomponent.cxx | 4 +- forms/source/component/refvaluecomponent.hxx | 6 +- forms/source/component/scrollbar.cxx | 12 +- forms/source/component/scrollbar.hxx | 12 +- forms/source/component/spinbutton.cxx | 12 +- forms/source/component/spinbutton.hxx | 12 +- forms/source/helper/controlfeatureinterception.cxx | 4 +- forms/source/helper/formnavigation.cxx | 10 +- forms/source/helper/windowstateguard.cxx | 28 +- forms/source/inc/FormComponent.hxx | 174 ++-- forms/source/inc/InterfaceContainer.hxx | 76 +- forms/source/inc/controlfeatureinterception.hxx | 4 +- forms/source/inc/formcontrolfont.hxx | 5 +- forms/source/inc/formnavigation.hxx | 10 +- forms/source/misc/InterfaceContainer.cxx | 75 +- forms/source/richtext/attributedispatcher.cxx | 2 +- forms/source/richtext/attributedispatcher.hxx | 2 +- forms/source/richtext/clipboarddispatcher.cxx | 2 +- forms/source/richtext/clipboarddispatcher.hxx | 2 +- forms/source/richtext/featuredispatcher.cxx | 4 +- forms/source/richtext/featuredispatcher.hxx | 4 +- .../richtext/parametrizedattributedispatcher.cxx | 2 +- .../richtext/parametrizedattributedispatcher.hxx | 2 +- forms/source/richtext/richtextcontrol.cxx | 22 +- forms/source/richtext/richtextcontrol.hxx | 24 +- forms/source/richtext/richtextmodel.cxx | 18 +- forms/source/richtext/richtextmodel.hxx | 21 +- forms/source/richtext/specialdispatchers.cxx | 4 +- forms/source/richtext/specialdispatchers.hxx | 6 +- forms/source/runtime/formoperations.cxx | 46 +- forms/source/runtime/formoperations.hxx | 46 +- forms/source/solar/component/navbarcontrol.cxx | 24 +- forms/source/solar/component/navbarcontrol.hxx | 24 +- forms/source/xforms/NameContainer.hxx | 34 +- forms/source/xforms/binding.cxx | 30 - forms/source/xforms/binding.hxx | 71 +- forms/source/xforms/collection.hxx | 42 +- forms/source/xforms/datatyperepository.cxx | 20 +- forms/source/xforms/datatyperepository.hxx | 20 +- forms/source/xforms/datatypes.cxx | 40 +- forms/source/xforms/datatypes.hxx | 44 +- forms/source/xforms/enumeration.cxx | 4 - forms/source/xforms/enumeration.hxx | 8 +- forms/source/xforms/model.cxx | 29 - forms/source/xforms/model.hxx | 169 ++-- forms/source/xforms/model_ui.cxx | 23 - forms/source/xforms/namedcollection.hxx | 17 +- forms/source/xforms/propertysetbase.cxx | 4 +- forms/source/xforms/propertysetbase.hxx | 8 +- forms/source/xforms/submission.cxx | 28 +- forms/source/xforms/submission.hxx | 45 +- forms/source/xforms/submission/submission.hxx | 10 +- forms/source/xforms/xforms_services.cxx | 9 +- forms/source/xforms/xformsevent.cxx | 21 +- forms/source/xforms/xformsevent.hxx | 24 +- forms/source/xforms/xpathlib/extension.cxx | 4 +- forms/source/xforms/xpathlib/extension.hxx | 4 +- formula/source/core/api/FormulaOpCodeMapperObj.cxx | 12 +- fpicker/source/aqua/FilterHelper.hxx | 12 +- fpicker/source/aqua/FilterHelper.mm | 4 - fpicker/source/aqua/SalAquaFilePicker.hxx | 76 +- fpicker/source/aqua/SalAquaFilePicker.mm | 34 +- fpicker/source/aqua/SalAquaFolderPicker.hxx | 33 +- fpicker/source/aqua/SalAquaFolderPicker.mm | 16 +- fpicker/source/aqua/SalAquaPicker.hxx | 9 +- fpicker/source/aqua/SalAquaPicker.mm | 5 +- fpicker/source/office/OfficeFilePicker.cxx | 60 +- fpicker/source/office/OfficeFilePicker.hxx | 86 +- fpicker/source/office/OfficeFolderPicker.cxx | 23 +- fpicker/source/office/OfficeFolderPicker.hxx | 28 +- fpicker/source/office/commonpicker.cxx | 25 +- fpicker/source/office/commonpicker.hxx | 26 +- fpicker/source/office/fpinteraction.cxx | 2 +- fpicker/source/office/fpinteraction.hxx | 2 +- fpicker/source/win32/filepicker/FilePicker.cxx | 46 +- fpicker/source/win32/filepicker/FilePicker.hxx | 90 +- .../source/win32/filepicker/VistaFilePicker.cxx | 38 - .../source/win32/filepicker/VistaFilePicker.hxx | 103 +-- .../filepicker/VistaFilePickerEventHandler.cxx | 2 - .../filepicker/VistaFilePickerEventHandler.hxx | 9 +- .../source/win32/filepicker/WinFileOpenImpl.cxx | 24 +- .../source/win32/filepicker/WinFileOpenImpl.hxx | 84 +- fpicker/source/win32/filepicker/dibpreview.cxx | 11 +- fpicker/source/win32/filepicker/dibpreview.hxx | 18 +- fpicker/source/win32/filepicker/previewadapter.cxx | 12 +- fpicker/source/win32/filepicker/previewadapter.hxx | 5 +- fpicker/source/win32/filepicker/previewbase.cxx | 11 +- fpicker/source/win32/filepicker/previewbase.hxx | 25 +- fpicker/source/win32/folderpicker/FolderPicker.cxx | 13 +- fpicker/source/win32/folderpicker/FolderPicker.hxx | 30 +- fpicker/source/win32/folderpicker/WinFOPImpl.cxx | 6 +- fpicker/source/win32/folderpicker/WinFOPImpl.hxx | 14 +- fpicker/source/win32/misc/WinImplHelper.cxx | 6 - fpicker/source/win32/misc/WinImplHelper.hxx | 24 +- framework/inc/classes/actiontriggercontainer.hxx | 22 +- framework/inc/classes/actiontriggerpropertyset.hxx | 28 +- .../classes/actiontriggerseparatorpropertyset.hxx | 26 +- framework/inc/classes/imagewrapper.hxx | 8 +- .../inc/classes/rootactiontriggercontainer.hxx | 49 +- framework/inc/dispatch/closedispatcher.hxx | 12 +- .../inc/dispatch/dispatchinformationprovider.hxx | 6 +- framework/inc/dispatch/dispatchprovider.hxx | 4 +- framework/inc/dispatch/interceptionhelper.hxx | 14 +- framework/inc/dispatch/mailtodispatcher.hxx | 16 +- framework/inc/dispatch/oxt_handler.hxx | 12 +- framework/inc/dispatch/popupmenudispatcher.hxx | 21 +- framework/inc/dispatch/servicehandler.hxx | 16 +- framework/inc/dispatch/startmoduledispatcher.hxx | 12 +- framework/inc/dispatch/systemexec.hxx | 14 +- .../inc/helper/dockingareadefaultacceptor.hxx | 6 +- framework/inc/helper/mischelper.hxx | 24 +- framework/inc/helper/ocomponentaccess.hxx | 6 +- framework/inc/helper/ocomponentenumeration.hxx | 8 +- framework/inc/helper/oframes.hxx | 16 +- framework/inc/helper/persistentwindowstate.hxx | 10 +- framework/inc/helper/propertysetcontainer.hxx | 24 +- framework/inc/helper/statusindicator.hxx | 15 +- framework/inc/helper/statusindicatorfactory.hxx | 19 +- framework/inc/helper/tagwindowasmodified.hxx | 13 +- framework/inc/helper/titlebarupdate.hxx | 13 +- .../inc/helper/uiconfigelementwrapperbase.hxx | 42 +- framework/inc/helper/uielementwrapperbase.hxx | 28 +- framework/inc/helper/vclstatusindicator.hxx | 15 +- framework/inc/interaction/quietinteraction.hxx | 2 +- framework/inc/jobs/helponstartup.hxx | 10 +- framework/inc/jobs/job.hxx | 14 +- framework/inc/jobs/shelljob.hxx | 7 +- framework/inc/macros/xinterface.hxx | 4 +- framework/inc/macros/xserviceinfo.hxx | 15 +- framework/inc/macros/xtypeprovider.hxx | 8 +- framework/inc/recording/dispatchrecorder.hxx | 22 +- .../inc/recording/dispatchrecordersupplier.hxx | 8 +- framework/inc/services/desktop.hxx | 120 ++- framework/inc/services/layoutmanager.hxx | 108 ++- .../inc/services/mediatypedetectionhelper.hxx | 5 +- framework/inc/services/uriabbreviation.hxx | 4 +- framework/inc/tabwin/tabwindow.hxx | 54 +- framework/inc/tabwin/tabwinfactory.hxx | 6 +- framework/inc/threadhelp/transactionmanager.hxx | 4 +- .../inc/uiconfiguration/graphicnameaccess.hxx | 16 +- framework/inc/uiconfiguration/imagemanager.hxx | 50 +- .../inc/uiconfiguration/moduleimagemanager.hxx | 39 +- framework/inc/uielement/addonstoolbarmanager.hxx | 2 +- framework/inc/uielement/addonstoolbarwrapper.hxx | 6 +- .../inc/uielement/buttontoolbarcontroller.hxx | 26 +- .../inc/uielement/comboboxtoolbarcontroller.hxx | 2 +- .../inc/uielement/complextoolbarcontroller.hxx | 6 +- framework/inc/uielement/constitemcontainer.hxx | 32 +- .../inc/uielement/dropdownboxtoolbarcontroller.hxx | 2 +- framework/inc/uielement/edittoolbarcontroller.hxx | 2 +- framework/inc/uielement/fontmenucontroller.hxx | 10 +- framework/inc/uielement/fontsizemenucontroller.hxx | 8 +- framework/inc/uielement/footermenucontroller.hxx | 8 +- .../inc/uielement/genericstatusbarcontroller.hxx | 6 +- .../inc/uielement/generictoolbarcontroller.hxx | 10 +- framework/inc/uielement/headermenucontroller.hxx | 8 +- .../inc/uielement/imagebuttontoolbarcontroller.hxx | 2 +- framework/inc/uielement/itemcontainer.hxx | 21 +- .../inc/uielement/langselectionmenucontroller.hxx | 10 +- framework/inc/uielement/macrosmenucontroller.hxx | 6 +- framework/inc/uielement/menubarmanager.hxx | 22 +- framework/inc/uielement/menubarwrapper.hxx | 18 +- framework/inc/uielement/newmenucontroller.hxx | 12 +- .../inc/uielement/notebookbarmenucontroller.hxx | 12 +- framework/inc/uielement/progressbarwrapper.hxx | 18 +- framework/inc/uielement/rootitemcontainer.hxx | 37 +- .../inc/uielement/spinfieldtoolbarcontroller.hxx | 2 +- framework/inc/uielement/statusbaritem.hxx | 34 +- framework/inc/uielement/statusbarmanager.hxx | 16 +- framework/inc/uielement/statusbarwrapper.hxx | 8 +- .../uielement/statusindicatorinterfacewrapper.hxx | 10 +- .../uielement/togglebuttontoolbarcontroller.hxx | 4 +- framework/inc/uielement/toolbarmanager.hxx | 16 +- .../inc/uielement/toolbarmodemenucontroller.hxx | 12 +- framework/inc/uielement/toolbarsmenucontroller.hxx | 14 +- framework/inc/uielement/toolbarwrapper.hxx | 18 +- framework/inc/uielement/uicommanddescription.hxx | 24 +- .../configurationaccessfactorymanager.hxx | 8 +- framework/inc/uifactory/factoryconfiguration.hxx | 8 +- framework/inc/uifactory/menubarfactory.hxx | 11 +- .../inc/xml/acceleratorconfigurationreader.hxx | 32 +- framework/inc/xml/imagesdocumenthandler.hxx | 54 +- framework/inc/xml/menudocumenthandler.hxx | 118 +-- framework/inc/xml/saxnamespacefilter.hxx | 32 +- framework/inc/xml/statusbardocumenthandler.hxx | 40 +- framework/inc/xml/toolboxdocumenthandler.hxx | 52 +- framework/inc/xml/xmlnamespaces.hxx | 12 +- framework/qa/cppunit/dispatchtest.cxx | 27 +- .../accelerators/acceleratorconfiguration.cxx | 66 -- .../documentacceleratorconfiguration.cxx | 17 +- .../globalacceleratorconfiguration.cxx | 12 +- framework/source/accelerators/keymapping.cxx | 1 - .../moduleacceleratorconfiguration.cxx | 12 +- framework/source/dispatch/closedispatcher.cxx | 6 - framework/source/dispatch/dispatchdisabler.cxx | 22 +- .../dispatch/dispatchinformationprovider.cxx | 2 - framework/source/dispatch/dispatchprovider.cxx | 4 +- framework/source/dispatch/interceptionhelper.cxx | 5 - framework/source/dispatch/loaddispatcher.cxx | 5 - framework/source/dispatch/mailtodispatcher.cxx | 14 +- framework/source/dispatch/oxt_handler.cxx | 3 - framework/source/dispatch/popupmenudispatcher.cxx | 14 +- framework/source/dispatch/servicehandler.cxx | 14 +- .../source/dispatch/startmoduledispatcher.cxx | 6 - framework/source/dispatch/systemexec.cxx | 12 +- .../source/fwe/classes/actiontriggercontainer.cxx | 11 +- .../fwe/classes/actiontriggerpropertyset.cxx | 14 +- .../classes/actiontriggerseparatorpropertyset.cxx | 12 +- framework/source/fwe/classes/imagewrapper.cxx | 8 +- .../fwe/classes/rootactiontriggercontainer.cxx | 24 +- framework/source/fwe/dispatch/interaction.cxx | 24 +- .../source/fwe/helper/actiontriggerhelper.cxx | 6 +- framework/source/fwe/helper/documentundoguard.cxx | 48 +- .../source/fwe/helper/propertysetcontainer.cxx | 7 - framework/source/fwe/helper/titlehelper.cxx | 8 - .../interaction/preventduplicateinteraction.cxx | 3 - framework/source/fwe/xml/menuconfiguration.cxx | 2 - framework/source/fwe/xml/menudocumenthandler.cxx | 25 - framework/source/fwe/xml/saxnamespacefilter.cxx | 8 - .../source/fwe/xml/statusbardocumenthandler.cxx | 12 +- .../source/fwe/xml/toolboxdocumenthandler.cxx | 21 +- framework/source/fwe/xml/xmlnamespaces.cxx | 8 +- .../source/fwi/threadhelp/transactionmanager.cxx | 4 +- .../source/fwi/uielement/constitemcontainer.cxx | 14 +- framework/source/fwi/uielement/itemcontainer.cxx | 6 - .../source/fwi/uielement/rootitemcontainer.cxx | 17 +- .../source/helper/dockingareadefaultacceptor.cxx | 6 +- framework/source/helper/ocomponentaccess.cxx | 6 +- framework/source/helper/ocomponentenumeration.cxx | 8 +- framework/source/helper/oframes.cxx | 16 +- framework/source/helper/persistentwindowstate.cxx | 4 - framework/source/helper/statusindicator.cxx | 5 - framework/source/helper/statusindicatorfactory.cxx | 4 - framework/source/helper/tagwindowasmodified.cxx | 5 - framework/source/helper/titlebarupdate.cxx | 5 - .../source/helper/uiconfigelementwrapperbase.cxx | 34 +- framework/source/helper/uielementwrapperbase.cxx | 23 +- framework/source/helper/vclstatusindicator.cxx | 5 - .../inc/accelerators/acceleratorconfiguration.hxx | 148 +--- framework/source/inc/accelerators/keymapping.hxx | 3 +- framework/source/inc/dispatch/dispatchdisabler.hxx | 51 +- framework/source/inc/dispatch/loaddispatcher.hxx | 15 +- framework/source/inc/loadenv/loadenv.hxx | 26 +- framework/source/interaction/quietinteraction.cxx | 2 +- framework/source/jobs/helponstartup.cxx | 4 - framework/source/jobs/job.cxx | 14 +- framework/source/jobs/jobdispatch.cxx | 39 +- framework/source/jobs/jobexecutor.cxx | 33 +- framework/source/jobs/shelljob.cxx | 3 - framework/source/layoutmanager/layoutmanager.cxx | 57 +- .../source/layoutmanager/toolbarlayoutmanager.cxx | 18 +- .../source/layoutmanager/toolbarlayoutmanager.hxx | 32 +- framework/source/loadenv/loadenv.cxx | 26 +- framework/source/recording/dispatchrecorder.cxx | 20 +- .../source/recording/dispatchrecordersupplier.cxx | 6 +- .../services/ContextChangeEventMultiplexer.cxx | 32 +- framework/source/services/autorecovery.cxx | 57 +- framework/source/services/desktop.cxx | 95 +-- framework/source/services/dispatchhelper.cxx | 4 - framework/source/services/frame.cxx | 337 ++------ .../source/services/mediatypedetectionhelper.cxx | 1 - framework/source/services/modulemanager.cxx | 61 +- framework/source/services/pathsettings.cxx | 161 ++-- framework/source/services/sessionlistener.cxx | 40 +- framework/source/services/substitutepathvars.cxx | 33 +- framework/source/services/taskcreatorsrv.cxx | 21 +- framework/source/services/uriabbreviation.cxx | 2 +- framework/source/services/urltransformer.cxx | 29 +- framework/source/tabwin/tabwindow.cxx | 28 +- framework/source/tabwin/tabwinfactory.cxx | 2 - .../source/uiconfiguration/globalsettings.cxx | 12 +- .../source/uiconfiguration/graphicnameaccess.cxx | 7 - framework/source/uiconfiguration/imagemanager.cxx | 34 +- .../source/uiconfiguration/imagemanagerimpl.cxx | 33 +- .../source/uiconfiguration/imagemanagerimpl.hxx | 38 +- .../source/uiconfiguration/moduleimagemanager.cxx | 33 +- .../source/uiconfiguration/moduleuicfgsupplier.cxx | 13 +- .../moduleuiconfigurationmanager.cxx | 93 +-- .../uiconfiguration/uicategorydescription.cxx | 45 +- .../uiconfiguration/uiconfigurationmanager.cxx | 95 +-- .../uiconfiguration/windowstateconfiguration.cxx | 77 +- .../source/uielement/addonstoolbarmanager.cxx | 2 +- .../source/uielement/addonstoolbarwrapper.cxx | 6 +- .../source/uielement/buttontoolbarcontroller.cxx | 14 +- .../source/uielement/comboboxtoolbarcontroller.cxx | 1 - .../source/uielement/complextoolbarcontroller.cxx | 3 - .../source/uielement/controlmenucontroller.cxx | 29 +- .../uielement/dropdownboxtoolbarcontroller.cxx | 1 - .../source/uielement/edittoolbarcontroller.cxx | 1 - framework/source/uielement/fontmenucontroller.cxx | 8 +- .../source/uielement/fontsizemenucontroller.cxx | 6 +- .../uielement/genericstatusbarcontroller.cxx | 3 - .../source/uielement/generictoolbarcontroller.cxx | 7 +- .../source/uielement/headermenucontroller.cxx | 6 +- .../uielement/imagebuttontoolbarcontroller.cxx | 1 - .../uielement/langselectionmenucontroller.cxx | 8 +- .../uielement/langselectionstatusbarcontroller.cxx | 15 +- .../source/uielement/macrosmenucontroller.cxx | 4 +- framework/source/uielement/menubarmanager.cxx | 20 +- framework/source/uielement/menubarwrapper.cxx | 15 +- framework/source/uielement/newmenucontroller.cxx | 10 +- .../source/uielement/notebookbarmenucontroller.cxx | 10 +- .../source/uielement/objectmenucontroller.cxx | 17 +- .../source/uielement/popuptoolbarcontroller.cxx | 83 +- framework/source/uielement/progressbarwrapper.cxx | 9 - .../source/uielement/recentfilesmenucontroller.cxx | 31 +- .../source/uielement/resourcemenucontroller.cxx | 33 +- .../uielement/spinfieldtoolbarcontroller.cxx | 1 - framework/source/uielement/statusbaritem.cxx | 17 - framework/source/uielement/statusbarmanager.cxx | 15 +- framework/source/uielement/statusbarwrapper.cxx | 8 +- .../uielement/statusindicatorinterfacewrapper.cxx | 5 - .../source/uielement/subtoolbarcontroller.cxx | 60 +- .../source/uielement/thesaurusmenucontroller.cxx | 9 +- .../uielement/togglebuttontoolbarcontroller.cxx | 2 - framework/source/uielement/toolbarmanager.cxx | 15 +- .../source/uielement/toolbarmodemenucontroller.cxx | 10 +- .../source/uielement/toolbarsmenucontroller.cxx | 12 +- framework/source/uielement/toolbarwrapper.cxx | 16 +- .../source/uielement/uicommanddescription.cxx | 41 +- .../source/uifactory/addonstoolbarfactory.cxx | 14 +- .../source/uifactory/factoryconfiguration.cxx | 8 +- framework/source/uifactory/menubarfactory.cxx | 1 - framework/source/uifactory/statusbarfactory.cxx | 12 +- framework/source/uifactory/toolbarfactory.cxx | 13 +- framework/source/uifactory/uicontrollerfactory.cxx | 45 +- .../source/uifactory/uielementfactorymanager.cxx | 32 +- .../uifactory/windowcontentfactorymanager.cxx | 15 +- .../source/xml/acceleratorconfigurationreader.cxx | 16 - framework/source/xml/imagesdocumenthandler.cxx | 27 +- helpcompiler/inc/HelpCompiler.hxx | 2 +- helpcompiler/inc/HelpLinker.hxx | 5 +- helpcompiler/source/HelpCompiler.cxx | 1 - helpcompiler/source/HelpLinker.cxx | 3 +- hwpfilter/source/attributes.cxx | 12 +- hwpfilter/source/attributes.hxx | 12 +- hwpfilter/source/hwpreader.cxx | 2 +- hwpfilter/source/hwpreader.hxx | 34 +- i18npool/inc/breakiteratorImpl.hxx | 57 +- i18npool/inc/breakiterator_cjk.hxx | 12 +- i18npool/inc/breakiterator_ctl.hxx | 9 +- i18npool/inc/breakiterator_th.hxx | 2 +- i18npool/inc/breakiterator_unicode.hxx | 28 +- i18npool/inc/calendarImpl.hxx | 62 +- i18npool/inc/calendar_gregorian.hxx | 76 +- i18npool/inc/calendar_hijri.hxx | 4 +- i18npool/inc/calendar_jewish.hxx | 6 +- i18npool/inc/cclass_unicode.hxx | 27 +- i18npool/inc/chaptercollator.hxx | 10 +- i18npool/inc/characterclassificationImpl.hxx | 42 +- i18npool/inc/collatorImpl.hxx | 28 +- i18npool/inc/collator_unicode.hxx | 24 +- i18npool/inc/defaultnumberingprovider.hxx | 37 +- i18npool/inc/indexentrysupplier.hxx | 40 +- i18npool/inc/indexentrysupplier_asian.hxx | 12 +- i18npool/inc/indexentrysupplier_common.hxx | 39 +- i18npool/inc/indexentrysupplier_default.hxx | 16 +- i18npool/inc/indexentrysupplier_ja_phonetic.hxx | 12 +- i18npool/inc/inputsequencechecker.hxx | 15 +- i18npool/inc/inputsequencechecker_hi.hxx | 4 +- i18npool/inc/inputsequencechecker_th.hxx | 4 +- i18npool/inc/localedata.hxx | 69 +- i18npool/inc/nativenumbersupplier.hxx | 27 +- i18npool/inc/numberformatcode.hxx | 17 +- i18npool/inc/ordinalsuffix.hxx | 8 +- i18npool/inc/textToPronounce_zh.hxx | 15 +- i18npool/inc/textconversion.hxx | 69 +- i18npool/inc/textconversionImpl.hxx | 32 +- i18npool/inc/transliterationImpl.hxx | 57 +- i18npool/inc/transliteration_Ignore.hxx | 37 +- i18npool/inc/transliteration_Numeric.hxx | 21 +- i18npool/inc/transliteration_OneToOne.hxx | 32 +- i18npool/inc/transliteration_body.hxx | 22 +- i18npool/inc/transliteration_caseignore.hxx | 20 +- i18npool/inc/transliteration_commonclass.hxx | 56 +- i18npool/inc/unoscripttypedetector.hxx | 21 +- .../source/breakiterator/breakiteratorImpl.cxx | 47 +- .../source/breakiterator/breakiterator_cjk.cxx | 7 +- .../source/breakiterator/breakiterator_ctl.cxx | 5 +- i18npool/source/breakiterator/breakiterator_th.cxx | 1 - .../source/breakiterator/breakiterator_unicode.cxx | 22 +- i18npool/source/calendar/calendarImpl.cxx | 60 +- i18npool/source/calendar/calendar_gregorian.cxx | 74 +- i18npool/source/calendar/calendar_hijri.cxx | 4 +- i18npool/source/calendar/calendar_jewish.cxx | 5 +- .../characterclassification/cclass_unicode.cxx | 24 +- .../characterclassificationImpl.cxx | 21 +- .../unoscripttypedetector.cxx | 18 +- i18npool/source/collator/chaptercollator.cxx | 10 +- i18npool/source/collator/collatorImpl.cxx | 20 +- i18npool/source/collator/collator_unicode.cxx | 11 +- .../defaultnumberingprovider.cxx | 16 +- i18npool/source/indexentry/indexentrysupplier.cxx | 26 +- .../source/indexentry/indexentrysupplier_asian.cxx | 7 +- .../indexentry/indexentrysupplier_common.cxx | 25 +- .../indexentry/indexentrysupplier_default.cxx | 11 +- .../indexentry/indexentrysupplier_ja_phonetic.cxx | 11 +- .../source/inputchecker/inputsequencechecker.cxx | 12 +- .../inputchecker/inputsequencechecker_hi.cxx | 2 - .../inputchecker/inputsequencechecker_th.cxx | 3 +- i18npool/source/localedata/localedata.cxx | 80 +- i18npool/source/localedata/saxparser.cxx | 52 +- .../source/nativenumber/nativenumbersupplier.cxx | 24 +- .../source/numberformatcode/numberformatcode.cxx | 12 +- i18npool/source/ordinalsuffix/ordinalsuffix.cxx | 8 +- i18npool/source/search/textsearch.cxx | 19 +- i18npool/source/search/textsearch.hxx | 48 +- i18npool/source/textconversion/textconversion.cxx | 6 +- .../source/textconversion/textconversionImpl.cxx | 11 +- .../source/textconversion/textconversion_ko.cxx | 4 - .../source/textconversion/textconversion_zh.cxx | 4 - .../transliteration/fullwidthToHalfwidth.cxx | 6 - .../transliteration/halfwidthToFullwidth.cxx | 3 - .../transliteration/ignoreDiacritics_CTL.cxx | 3 - .../ignoreIandEfollowedByYa_ja_JP.cxx | 1 - .../transliteration/ignoreIterationMark_ja_JP.cxx | 1 - i18npool/source/transliteration/ignoreKana.cxx | 4 +- .../ignoreKiKuFollowedBySa_ja_JP.cxx | 1 - .../ignoreProlongedSoundMark_ja_JP.cxx | 1 - .../source/transliteration/ignoreSize_ja_JP.cxx | 4 +- i18npool/source/transliteration/ignoreWidth.cxx | 4 +- .../source/transliteration/textToPronounce_zh.cxx | 9 +- .../source/transliteration/transliterationImpl.cxx | 37 +- .../transliteration/transliteration_Ignore.cxx | 13 +- .../transliteration/transliteration_Numeric.cxx | 11 +- .../transliteration/transliteration_OneToOne.cxx | 9 +- .../transliteration/transliteration_body.cxx | 14 +- .../transliteration/transliteration_caseignore.cxx | 8 +- .../transliteration_commonclass.cxx | 20 +- i18nutil/source/utility/casefolding.cxx | 6 +- idlc/inc/options.hxx | 9 +- idlc/source/options.cxx | 5 +- include/basegfx/tools/unopolypolygon.hxx | 36 +- include/basegfx/tools/unotools.hxx | 3 +- include/basic/modsizeexceeded.hxx | 4 +- include/canvas/base/bitmapcanvasbase.hxx | 9 +- include/canvas/base/bufferedgraphicdevicebase.hxx | 23 +- include/canvas/base/cachedprimitivebase.hxx | 8 +- include/canvas/base/canvasbase.hxx | 70 +- include/canvas/base/canvascustomspritebase.hxx | 24 +- include/canvas/base/disambiguationhelper.hxx | 4 +- include/canvas/base/graphicdevicebase.hxx | 72 +- include/canvas/base/integerbitmapbase.hxx | 10 +- include/canvas/base/spritecanvasbase.hxx | 13 +- include/canvas/parametricpolypolygon.hxx | 14 +- include/codemaker/options.hxx | 6 +- include/comphelper/ChainablePropertySet.hxx | 100 +-- include/comphelper/ChainablePropertySetInfo.hxx | 9 +- include/comphelper/MasterPropertySet.hxx | 85 +- include/comphelper/MasterPropertySetInfo.hxx | 9 +- include/comphelper/SelectionMultiplex.hxx | 9 +- include/comphelper/SettingsHelper.hxx | 38 +- include/comphelper/accessiblecomponenthelper.hxx | 32 +- include/comphelper/accessiblecontexthelper.hxx | 24 +- include/comphelper/accessiblekeybindinghelper.hxx | 8 +- include/comphelper/accessibleselectionhelper.hxx | 39 +- include/comphelper/accessibletexthelper.hxx | 40 +- include/comphelper/accessiblewrapper.hxx | 48 +- include/comphelper/accimplaccess.hxx | 2 +- include/comphelper/attributelist.hxx | 20 +- include/comphelper/configurationlistener.hxx | 6 +- include/comphelper/containermultiplexer.hxx | 24 +- include/comphelper/docpasswordrequest.hxx | 8 +- include/comphelper/enumhelper.hxx | 19 +- include/comphelper/eventattachermgr.hxx | 3 +- include/comphelper/evtlistenerhlp.hxx | 2 +- include/comphelper/extract.hxx | 2 - include/comphelper/interaction.hxx | 12 +- include/comphelper/numberedcollection.hxx | 15 +- include/comphelper/ofopxmlhelper.hxx | 12 +- include/comphelper/oslfile2streamwrap.hxx | 16 +- include/comphelper/propagg.hxx | 35 +- include/comphelper/propertycontainer.hxx | 12 +- include/comphelper/propertysethelper.hxx | 42 +- include/comphelper/propertysetinfo.hxx | 6 +- include/comphelper/propertystatecontainer.hxx | 10 +- include/comphelper/propmultiplex.hxx | 10 +- include/comphelper/propstate.hxx | 10 +- include/comphelper/proxyaggregation.hxx | 16 +- include/comphelper/seekableinput.hxx | 16 +- include/comphelper/seqstream.hxx | 30 +- include/comphelper/servicedecl.hxx | 8 +- include/comphelper/servicehelper.hxx | 6 +- include/comphelper/serviceinfohelper.hxx | 4 +- include/comphelper/storagehelper.hxx | 43 +- include/comphelper/types.hxx | 2 +- include/comphelper/unique_disposing_ptr.hxx | 19 +- include/comphelper/uno3.hxx | 26 +- include/comphelper/weak.hxx | 6 +- include/comphelper/weakeventlistener.hxx | 4 +- include/connectivity/BlobHelper.hxx | 10 +- include/connectivity/CommonTools.hxx | 14 +- include/connectivity/ConnectionWrapper.hxx | 6 +- include/connectivity/PColumn.hxx | 2 +- include/connectivity/ParameterCont.hxx | 2 +- include/connectivity/TColumnsHelper.hxx | 2 +- include/connectivity/TIndexColumns.hxx | 2 +- include/connectivity/TIndexes.hxx | 2 +- include/connectivity/TKeyColumns.hxx | 2 +- include/connectivity/TKeys.hxx | 2 +- include/connectivity/TTableHelper.hxx | 6 +- include/connectivity/conncleanup.hxx | 10 +- include/connectivity/dbconversion.hxx | 4 +- include/connectivity/dbexception.hxx | 33 +- include/connectivity/dbtools.hxx | 6 +- include/connectivity/paramwrapper.hxx | 20 +- include/connectivity/sdbcx/VCatalog.hxx | 8 +- include/connectivity/sdbcx/VCollection.hxx | 42 +- include/connectivity/sdbcx/VColumn.hxx | 12 +- include/connectivity/sdbcx/VDescriptor.hxx | 6 +- include/connectivity/sdbcx/VGroup.hxx | 20 +- include/connectivity/sdbcx/VIndex.hxx | 14 +- include/connectivity/sdbcx/VKey.hxx | 14 +- include/connectivity/sdbcx/VTable.hxx | 24 +- include/connectivity/sdbcx/VUser.hxx | 22 +- include/connectivity/sdbcx/VView.hxx | 10 +- include/cppuhelper/compbase.hxx | 17 +- include/cppuhelper/compbase12.hxx | 26 +- include/cppuhelper/compbase2.hxx | 26 +- include/cppuhelper/compbase3.hxx | 26 +- include/cppuhelper/compbase4.hxx | 26 +- include/cppuhelper/compbase5.hxx | 26 +- include/cppuhelper/compbase6.hxx | 26 +- include/cppuhelper/compbase7.hxx | 26 +- include/cppuhelper/compbase8.hxx | 26 +- include/cppuhelper/compbase9.hxx | 26 +- include/cppuhelper/compbase_ex.hxx | 27 +- include/cppuhelper/component.hxx | 21 +- include/cppuhelper/implbase.hxx | 18 +- include/cppuhelper/implbase1.hxx | 34 +- include/cppuhelper/implbase10.hxx | 34 +- include/cppuhelper/implbase12.hxx | 34 +- include/cppuhelper/implbase13.hxx | 34 +- include/cppuhelper/implbase2.hxx | 34 +- include/cppuhelper/implbase3.hxx | 34 +- include/cppuhelper/implbase4.hxx | 34 +- include/cppuhelper/implbase5.hxx | 34 +- include/cppuhelper/implbase6.hxx | 34 +- include/cppuhelper/implbase7.hxx | 34 +- include/cppuhelper/implbase8.hxx | 34 +- include/cppuhelper/implbase9.hxx | 34 +- include/cppuhelper/propertysetmixin.hxx | 69 +- include/cppuhelper/propshlp.hxx | 66 +- include/cppuhelper/weak.hxx | 6 +- include/cppuhelper/weakagg.hxx | 9 +- include/dbaccess/IController.hxx | 2 +- include/dbaccess/dbaundomanager.hxx | 44 +- include/dbaccess/dbsubcomponentcontroller.hxx | 22 +- include/dbaccess/genericcontroller.hxx | 82 +- .../drawinglayer/primitive2d/baseprimitive2d.hxx | 6 +- .../drawinglayer/primitive2d/bitmapprimitive2d.hxx | 2 +- .../drawinglayer/primitive2d/groupprimitive2d.hxx | 2 +- .../primitive2d/patternfillprimitive2d.hxx | 2 +- .../drawinglayer/primitive3d/baseprimitive3d.hxx | 4 +- include/editeng/AccessibleComponentBase.hxx | 39 +- include/editeng/AccessibleContextBase.hxx | 68 +- include/editeng/AccessibleEditableTextPara.hxx | 118 +-- include/editeng/AccessibleImageBullet.hxx | 50 +- include/editeng/AccessibleSelectionBase.hxx | 14 +- include/editeng/AccessibleStaticTextBase.hxx | 44 +- include/editeng/UnoForbiddenCharsTable.hxx | 12 +- include/editeng/unofield.hxx | 44 +- include/editeng/unonrule.hxx | 30 +- include/editeng/unopracc.hxx | 12 +- include/editeng/unotext.hxx | 245 +++--- include/filter/msfilter/msvbahelper.hxx | 23 +- include/formula/FormulaOpCodeMapperObj.hxx | 21 +- include/framework/dispatchhelper.hxx | 20 +- include/framework/menuconfiguration.hxx | 6 +- include/framework/preventduplicateinteraction.hxx | 9 +- include/framework/titlehelper.hxx | 24 +- include/i18nutil/casefolding.hxx | 6 +- include/linguistic/hyphdta.hxx | 30 +- include/linguistic/lngprophelp.hxx | 33 +- include/linguistic/misc.hxx | 6 +- include/linguistic/spelldta.hxx | 14 +- include/oox/core/contexthandler.hxx | 14 +- include/oox/core/contexthandler2.hxx | 16 +- include/oox/core/fastparser.hxx | 18 +- include/oox/core/fasttokenhandler.hxx | 10 +- include/oox/core/filterbase.hxx | 27 +- include/oox/core/filterdetect.hxx | 32 +- include/oox/core/fragmenthandler.hxx | 20 +- include/oox/core/fragmenthandler2.hxx | 24 +- include/oox/core/recordparser.hxx | 5 +- include/oox/core/relationshandler.hxx | 3 +- include/oox/core/xmlfilterbase.hxx | 3 +- include/oox/ppt/dgmimport.hxx | 4 +- include/oox/ppt/dgmlayout.hxx | 4 +- include/oox/ppt/pptimport.hxx | 8 +- include/oox/vml/vmlinputstream.hxx | 21 +- include/salhelper/condition.hxx | 5 +- include/sax/fastattribs.hxx | 14 +- include/sax/fastparser.hxx | 26 +- include/sax/tools/documenthandleradapter.hxx | 55 +- include/sfx2/DocumentMetadataAccess.hxx | 71 +- include/sfx2/Metadatable.hxx | 19 +- include/sfx2/docfilt.hxx | 6 +- include/sfx2/docstoragemodifylistener.hxx | 4 +- include/sfx2/sfxbasecontroller.hxx | 68 +- include/sfx2/sfxbasemodel.hxx | 388 +++------ include/sfx2/sfxstatuslistener.hxx | 10 +- include/sfx2/sidebar/Accessible.hxx | 3 +- include/sfx2/sidebar/SidebarController.hxx | 15 +- include/sfx2/sidebar/SidebarPanelBase.hxx | 36 +- include/sfx2/sidebar/Theme.hxx | 43 +- include/sfx2/sidebar/UnoDeck.hxx | 44 +- include/sfx2/sidebar/UnoDecks.hxx | 25 +- include/sfx2/sidebar/UnoPanel.hxx | 47 +- include/sfx2/sidebar/UnoPanels.hxx | 28 +- include/sfx2/sidebar/UnoSidebar.hxx | 18 +- include/sfx2/stbitem.hxx | 17 +- include/sfx2/tbxctrl.hxx | 20 +- include/sfx2/unoctitm.hxx | 24 +- include/sfx2/userinputinterception.hxx | 8 +- include/svl/itemprop.hxx | 45 +- include/svl/numuno.hxx | 9 +- include/svl/style.hxx | 2 +- include/svtools/accessibleruler.hxx | 63 +- include/svtools/cliplistener.hxx | 6 +- include/svtools/dialogclosedlistener.hxx | 4 +- include/svtools/framestatuslistener.hxx | 14 +- include/svtools/generictoolboxcontroller.hxx | 6 +- include/svtools/genericunodialog.hxx | 22 +- include/svtools/javacontext.hxx | 6 +- include/svtools/javainteractionhandler.hxx | 6 +- include/svtools/openfiledroptargetlistener.hxx | 12 +- include/svtools/popupmenucontrollerbase.hxx | 36 +- include/svtools/popupwindowcontroller.hxx | 12 +- include/svtools/statusbarcontroller.hxx | 30 +- include/svtools/toolbarmenu.hxx | 2 +- include/svtools/toolboxcontroller.hxx | 35 +- include/svtools/transfer.hxx | 47 +- include/svtools/unoevent.hxx | 72 +- include/svx/AccessibleControlShape.hxx | 33 +- include/svx/AccessibleGraphicShape.hxx | 29 +- include/svx/AccessibleOLEShape.hxx | 35 +- include/svx/AccessibleShape.hxx | 155 ++-- include/svx/ChildrenManager.hxx | 10 +- include/svx/IAccessibleParent.hxx | 8 +- include/svx/ParaSpacingControl.hxx | 12 +- include/svx/ShapeTypeHandler.hxx | 3 +- include/svx/SmartTagMgr.hxx | 6 +- include/svx/TextUnderlinePopup.hxx | 3 +- include/svx/fmdmod.hxx | 4 +- include/svx/fmdpage.hxx | 16 +- include/svx/fmgridif.hxx | 234 +++--- include/svx/fmsrcimp.hxx | 4 +- include/svx/fmtools.hxx | 9 +- include/svx/gridctrl.hxx | 2 +- include/svx/sidebar/SelectionChangeHandler.hxx | 9 +- include/svx/tbcontrl.hxx | 22 +- include/svx/tbxctl.hxx | 2 +- include/svx/unoapi.hxx | 7 +- include/svx/unomaster.hxx | 26 +- include/svx/unomod.hxx | 8 +- include/svx/unomodel.hxx | 26 +- include/svx/unopage.hxx | 42 +- include/svx/unopool.hxx | 28 +- include/svx/unoshape.hxx | 355 ++++---- include/svx/xmleohlp.hxx | 12 +- include/svx/xmlgrhlp.hxx | 8 +- include/test/testinteractionhandler.hxx | 18 +- include/toolkit/awt/animatedimagespeer.hxx | 22 +- include/toolkit/awt/vclxaccessiblecomponent.hxx | 44 +- include/toolkit/awt/vclxbitmap.hxx | 14 +- include/toolkit/awt/vclxcontainer.hxx | 20 +- include/toolkit/awt/vclxdevice.hxx | 30 +- include/toolkit/awt/vclxfont.hxx | 24 +- include/toolkit/awt/vclxgraphics.hxx | 70 +- include/toolkit/awt/vclxmenu.hxx | 92 +- include/toolkit/awt/vclxpointer.hxx | 15 +- include/toolkit/awt/vclxprinter.hxx | 103 ++- include/toolkit/awt/vclxregion.hxx | 32 +- include/toolkit/awt/vclxspinbutton.hxx | 32 +- include/toolkit/awt/vclxsystemdependentwindow.hxx | 8 +- include/toolkit/awt/vclxtabpagecontainer.hxx | 30 +- include/toolkit/awt/vclxtopwindow.hxx | 34 +- include/toolkit/awt/vclxwindow.hxx | 132 ++- include/toolkit/awt/vclxwindows.hxx | 744 ++++++++--------- .../toolkit/controls/accessiblecontrolcontext.hxx | 28 +- include/toolkit/controls/animatedimages.hxx | 36 +- .../toolkit/controls/controlmodelcontainerbase.hxx | 105 ++- include/toolkit/controls/dialogcontrol.hxx | 173 ++-- include/toolkit/controls/eventcontainer.hxx | 40 +- include/toolkit/controls/formattedcontrol.hxx | 26 +- include/toolkit/controls/geometrycontrolmodel.hxx | 25 +- .../toolkit/controls/geometrycontrolmodel_impl.hxx | 2 +- include/toolkit/controls/roadmapcontrol.hxx | 62 +- include/toolkit/controls/roadmapentry.hxx | 9 +- include/toolkit/controls/stdtabcontroller.hxx | 35 +- include/toolkit/controls/stdtabcontrollermodel.hxx | 39 +- include/toolkit/controls/tabpagecontainer.hxx | 54 +- include/toolkit/controls/tabpagemodel.hxx | 34 +- include/toolkit/controls/tkscrollbar.hxx | 62 +- include/toolkit/controls/unocontrol.hxx | 114 +-- include/toolkit/controls/unocontrolcontainer.hxx | 50 +- .../toolkit/controls/unocontrolcontainermodel.hxx | 10 +- include/toolkit/controls/unocontrolmodel.hxx | 46 +- include/toolkit/controls/unocontrols.hxx | 880 +++++++++----------- include/toolkit/helper/listenermultiplexer.hxx | 110 +-- include/toolkit/helper/macros.hxx | 26 +- include/toolkit/helper/vclunohelper.hxx | 2 +- include/ucbhelper/activedatasink.hxx | 6 +- include/ucbhelper/activedatastreamer.hxx | 8 +- include/ucbhelper/cancelcommandexecution.hxx | 6 +- include/ucbhelper/commandenvironment.hxx | 8 +- include/ucbhelper/content.hxx | 143 +--- include/ucbhelper/contenthelper.hxx | 86 +- include/ucbhelper/contentidentifier.hxx | 15 +- include/ucbhelper/contentinfo.hxx | 45 +- include/ucbhelper/fd_inputstream.hxx | 41 +- include/ucbhelper/interactionrequest.hxx | 141 ++-- include/ucbhelper/interceptedinteraction.hxx | 3 +- include/ucbhelper/macros.hxx | 9 +- include/ucbhelper/propertyvalueset.hxx | 93 +-- include/ucbhelper/providerhelper.hxx | 25 +- include/ucbhelper/registerucb.hxx | 3 +- include/ucbhelper/resultset.hxx | 234 ++---- include/ucbhelper/resultsethelper.hxx | 44 +- include/ucbhelper/resultsetmetadata.hxx | 93 +-- include/unotools/ZipPackageHelper.hxx | 6 +- include/unotools/accessiblerelationsethelper.hxx | 22 +- include/unotools/accessiblestatesethelper.hxx | 24 +- include/unotools/eventcfg.hxx | 14 +- include/unotools/mediadescriptor.hxx | 4 +- include/unotools/progresshandlerwrap.hxx | 9 +- include/unotools/streamhelper.hxx | 16 +- include/unotools/streamwrap.hxx | 42 +- include/vbahelper/vbaaccesshelper.hxx | 2 +- include/vbahelper/vbaapplicationbase.hxx | 38 +- include/vbahelper/vbacollectionimpl.hxx | 57 +- include/vbahelper/vbadialogbase.hxx | 2 +- include/vbahelper/vbadialogsbase.hxx | 4 +- include/vbahelper/vbadocumentbase.hxx | 22 +- include/vbahelper/vbadocumentsbase.hxx | 10 +- include/vbahelper/vbaeventshelperbase.hxx | 37 +- include/vbahelper/vbafontbase.hxx | 46 +- include/vbahelper/vbaglobalbase.hxx | 6 +- include/vbahelper/vbahelper.hxx | 39 +- include/vbahelper/vbahelperinterface.hxx | 12 +- include/vbahelper/vbapagesetupbase.hxx | 30 +- include/vbahelper/vbapropvalue.hxx | 6 +- include/vbahelper/vbareturntypes.hxx | 6 +- include/vbahelper/vbashape.hxx | 95 +-- include/vbahelper/vbashaperange.hxx | 62 +- include/vbahelper/vbashapes.hxx | 28 +- include/vbahelper/vbatextframe.hxx | 22 +- include/vbahelper/vbawindowbase.hxx | 34 +- include/vcl/dndhelp.hxx | 50 +- include/vcl/edit.hxx | 18 +- include/vcl/textview.hxx | 12 +- include/vcl/unohelp2.hxx | 8 +- include/vcl/vclstatuslistener.hxx | 8 +- include/xmloff/XMLEmbeddedObjectExportFilter.hxx | 45 +- include/xmloff/attrlist.hxx | 16 +- include/xmloff/fasttokenhandler.hxx | 6 +- include/xmloff/unoatrcn.hxx | 27 +- include/xmloff/xmlerror.hxx | 3 +- include/xmloff/xmlexp.hxx | 20 +- include/xmloff/xmlictxt.hxx | 21 +- include/xmloff/xmlimp.hxx | 102 +-- include/xmloff/xmlmetae.hxx | 32 +- include/xmlscript/xml_helper.hxx | 18 +- io/qa/textinputstream.cxx | 26 +- io/source/TextInputStream/TextInputStream.cxx | 62 +- io/source/TextOutputStream/TextOutputStream.cxx | 43 +- io/source/acceptor/acc_pipe.cxx | 28 +- io/source/acceptor/acc_socket.cxx | 38 +- io/source/acceptor/acceptor.cxx | 28 +- io/source/connector/connector.cxx | 16 +- io/source/connector/connector.hxx | 44 +- io/source/connector/ctr_pipe.cxx | 9 - io/source/connector/ctr_socket.cxx | 13 +- io/source/services.hxx | 16 +- io/source/stm/odata.cxx | 350 +++----- io/source/stm/omark.cxx | 203 ++--- io/source/stm/opipe.cxx | 87 +- io/source/stm/opump.cxx | 61 +- io/source/stm/streamhelper.cxx | 11 +- io/source/stm/streamhelper.hxx | 19 +- javaunohelper/source/vm.cxx | 8 +- .../source/hyphenator/hyphen/hyphenimp.cxx | 16 - .../source/hyphenator/hyphen/hyphenimp.hxx | 30 +- .../source/languageguessing/guesslang.cxx | 30 +- .../source/spellcheck/macosxspell/macspellimp.hxx | 28 +- .../source/spellcheck/macosxspell/macspellimp.mm | 15 - .../source/spellcheck/spell/sspellimp.cxx | 15 - .../source/spellcheck/spell/sspellimp.hxx | 28 +- .../source/thesaurus/libnth/nthesdta.cxx | 2 - .../source/thesaurus/libnth/nthesdta.hxx | 4 +- .../source/thesaurus/libnth/nthesimp.cxx | 12 - .../source/thesaurus/libnth/nthesimp.hxx | 22 +- linguistic/inc/iprcache.hxx | 6 +- linguistic/source/convdic.cxx | 19 - linguistic/source/convdic.hxx | 38 +- linguistic/source/convdiclist.cxx | 36 +- linguistic/source/convdiclist.hxx | 20 +- linguistic/source/convdicxml.cxx | 1 - linguistic/source/convdicxml.hxx | 2 +- linguistic/source/dicimp.cxx | 26 - linguistic/source/dicimp.hxx | 78 +- linguistic/source/dlistimp.cxx | 32 +- linguistic/source/dlistimp.hxx | 36 +- linguistic/source/gciterator.cxx | 17 +- linguistic/source/gciterator.hxx | 28 +- linguistic/source/hhconvdic.cxx | 6 +- linguistic/source/hhconvdic.hxx | 8 +- linguistic/source/hyphdsp.cxx | 5 - linguistic/source/hyphdsp.hxx | 18 +- linguistic/source/hyphdta.cxx | 10 - linguistic/source/iprcache.cxx | 3 - linguistic/source/lngopt.cxx | 27 +- linguistic/source/lngopt.hxx | 110 +-- linguistic/source/lngprophelp.cxx | 11 - linguistic/source/lngsvcmgr.cxx | 31 +- linguistic/source/lngsvcmgr.hxx | 36 +- linguistic/source/misc.cxx | 3 - linguistic/source/spelldsp.cxx | 10 - linguistic/source/spelldsp.hxx | 22 +- linguistic/source/spelldta.cxx | 7 - linguistic/source/thesdsp.cxx | 3 - linguistic/source/thesdsp.hxx | 10 +- .../source/filter/LotusWordProImportFilter.cxx | 9 - .../source/filter/LotusWordProImportFilter.hxx | 27 +- oox/inc/services.hxx | 14 +- oox/source/core/contexthandler.cxx | 14 +- oox/source/core/contexthandler2.cxx | 8 +- oox/source/core/fastparser.cxx | 12 +- oox/source/core/fasttokenhandler.cxx | 12 +- oox/source/core/filterbase.cxx | 24 +- oox/source/core/filterdetect.cxx | 23 +- oox/source/core/fragmenthandler.cxx | 20 +- oox/source/core/fragmenthandler2.cxx | 12 +- oox/source/core/recordparser.cxx | 22 +- oox/source/core/relationshandler.cxx | 2 +- oox/source/core/xmlfilterbase.cxx | 6 +- oox/source/crypto/DocumentDecryption.cxx | 34 +- oox/source/docprop/docprophandler.cxx | 10 - oox/source/docprop/docprophandler.hxx | 20 +- oox/source/docprop/ooxmldocpropimport.cxx | 11 +- oox/source/docprop/ooxmldocpropimport.hxx | 9 +- .../drawingml/diagram/diagramfragmenthandler.cxx | 2 - .../drawingml/diagram/diagramfragmenthandler.hxx | 4 +- oox/source/drawingml/diagram/layoutnodecontext.cxx | 3 +- oox/source/export/ColorPropertySet.cxx | 39 +- oox/source/export/ColorPropertySet.hxx | 52 +- oox/source/helper/propertymap.cxx | 40 +- oox/source/helper/textinputstream.cxx | 26 +- oox/source/mathml/import.cxx | 12 +- oox/source/ole/olestorage.cxx | 32 +- oox/source/ppt/dgmimport.cxx | 6 +- oox/source/ppt/dgmlayout.cxx | 6 +- oox/source/ppt/pptimport.cxx | 8 +- oox/source/shape/ShapeContextHandler.cxx | 33 +- oox/source/shape/ShapeContextHandler.hxx | 75 +- oox/source/shape/ShapeDrawingFragmentHandler.cxx | 2 +- oox/source/shape/ShapeDrawingFragmentHandler.hxx | 2 +- oox/source/shape/ShapeFilterBase.cxx | 4 +- oox/source/shape/ShapeFilterBase.hxx | 5 +- oox/source/vml/vmlinputstream.cxx | 13 +- package/inc/ByteChucker.hxx | 6 +- package/inc/ByteGrabber.hxx | 12 +- package/inc/CRC32.hxx | 15 +- package/inc/ZipOutputStream.hxx | 21 +- package/inc/ZipPackage.hxx | 60 +- package/inc/ZipPackageBuffer.hxx | 33 +- package/inc/ZipPackageEntry.hxx | 36 +- package/inc/ZipPackageFolder.hxx | 51 +- package/inc/ZipPackageStream.hxx | 51 +- package/inc/zipfileaccess.hxx | 26 +- package/source/manifest/ManifestImport.cxx | 13 - package/source/manifest/ManifestImport.hxx | 34 +- package/source/manifest/ManifestReader.cxx | 4 - package/source/manifest/ManifestReader.hxx | 12 +- package/source/manifest/ManifestWriter.cxx | 4 - package/source/manifest/ManifestWriter.hxx | 12 +- package/source/xstor/disposelistener.cxx | 1 - package/source/xstor/disposelistener.hxx | 2 +- package/source/xstor/ocompinstream.cxx | 70 -- package/source/xstor/ocompinstream.hxx | 62 +- package/source/xstor/ohierarchyholder.cxx | 5 - package/source/xstor/ohierarchyholder.hxx | 15 +- package/source/xstor/oseekinstream.cxx | 9 - package/source/xstor/oseekinstream.hxx | 10 +- package/source/xstor/owriteablestream.cxx | 108 --- package/source/xstor/owriteablestream.hxx | 111 +-- package/source/xstor/selfterminatefilestream.cxx | 25 - package/source/xstor/selfterminatefilestream.hxx | 21 +- package/source/xstor/switchpersistencestream.cxx | 15 - package/source/xstor/switchpersistencestream.hxx | 30 +- package/source/xstor/xfactory.cxx | 7 - package/source/xstor/xfactory.hxx | 10 +- package/source/xstor/xstorage.cxx | 276 ------ package/source/xstor/xstorage.hxx | 466 +++-------- package/source/zipapi/ByteChucker.cxx | 2 - package/source/zipapi/ByteGrabber.cxx | 4 - package/source/zipapi/CRC32.cxx | 5 - package/source/zipapi/MemoryByteGrabber.hxx | 1 - package/source/zipapi/XUnbufferedStream.cxx | 5 - package/source/zipapi/XUnbufferedStream.hxx | 15 +- package/source/zipapi/ZipFile.cxx | 15 +- package/source/zipapi/ZipOutputStream.cxx | 7 - package/source/zipapi/blowfishcontext.cxx | 2 - package/source/zipapi/blowfishcontext.hxx | 4 +- package/source/zipapi/sha1context.cxx | 2 - package/source/zipapi/sha1context.hxx | 4 +- package/source/zippackage/ZipPackage.cxx | 41 +- package/source/zippackage/ZipPackageBuffer.cxx | 11 - package/source/zippackage/ZipPackageEntry.cxx | 9 - package/source/zippackage/ZipPackageFolder.cxx | 17 - .../zippackage/ZipPackageFolderEnumeration.cxx | 5 - .../zippackage/ZipPackageFolderEnumeration.hxx | 15 +- package/source/zippackage/ZipPackageSink.cxx | 2 - package/source/zippackage/ZipPackageSink.hxx | 6 +- package/source/zippackage/ZipPackageStream.cxx | 23 - package/source/zippackage/wrapstreamforshare.cxx | 25 - package/source/zippackage/wrapstreamforshare.hxx | 21 +- package/source/zippackage/zipfileaccess.cxx | 18 - pyuno/inc/pyuno.hxx | 19 +- pyuno/source/loader/pyuno_loader.cxx | 5 +- pyuno/source/module/pyuno_adapter.cxx | 9 +- pyuno/source/module/pyuno_except.cxx | 1 - pyuno/source/module/pyuno_impl.hxx | 47 +- pyuno/source/module/pyuno_module.cxx | 2 +- pyuno/source/module/pyuno_runtime.cxx | 16 +- pyuno/source/module/pyuno_type.cxx | 6 +- pyuno/source/module/pyuno_util.cxx | 1 - .../source/unourl_resolver/unourl_resolver.cxx | 13 +- reportdesign/inc/PropertyForward.hxx | 4 +- reportdesign/inc/ReportDefinition.hxx | 248 +++--- reportdesign/inc/ReportHelperDefines.hxx | 308 +++---- reportdesign/inc/RptObject.hxx | 4 +- reportdesign/inc/UndoEnv.hxx | 12 +- reportdesign/source/core/api/FixedLine.cxx | 132 +-- reportdesign/source/core/api/FixedText.cxx | 80 +- reportdesign/source/core/api/FormatCondition.cxx | 34 +- reportdesign/source/core/api/FormattedField.cxx | 84 +- reportdesign/source/core/api/Function.cxx | 50 +- reportdesign/source/core/api/Functions.cxx | 26 +- reportdesign/source/core/api/Group.cxx | 72 +- reportdesign/source/core/api/Groups.cxx | 28 +- reportdesign/source/core/api/ImageControl.cxx | 110 +-- .../source/core/api/ReportControlModel.cxx | 16 +- reportdesign/source/core/api/ReportDefinition.cxx | 332 ++++---- reportdesign/source/core/api/ReportEngineJFree.cxx | 52 +- reportdesign/source/core/api/Section.cxx | 107 ++- reportdesign/source/core/api/Shape.cxx | 108 +-- reportdesign/source/core/inc/FixedLine.hxx | 80 +- reportdesign/source/core/inc/FixedText.hxx | 60 +- reportdesign/source/core/inc/FormatCondition.hxx | 38 +- reportdesign/source/core/inc/FormattedField.hxx | 64 +- reportdesign/source/core/inc/Function.hxx | 54 +- reportdesign/source/core/inc/Functions.hxx | 30 +- reportdesign/source/core/inc/Group.hxx | 76 +- reportdesign/source/core/inc/Groups.hxx | 32 +- reportdesign/source/core/inc/ImageControl.hxx | 70 +- .../source/core/inc/ReportControlModel.hxx | 16 +- reportdesign/source/core/inc/ReportDrawPage.hxx | 5 +- reportdesign/source/core/inc/ReportEngineJFree.hxx | 56 +- reportdesign/source/core/inc/ReportHelperImpl.hxx | 518 ++++++------ reportdesign/source/core/inc/RptObjectListener.hxx | 4 +- reportdesign/source/core/inc/Section.hxx | 112 +-- reportdesign/source/core/inc/Shape.hxx | 80 +- reportdesign/source/core/sdr/PropertyForward.cxx | 4 +- reportdesign/source/core/sdr/ReportDrawPage.cxx | 2 - reportdesign/source/core/sdr/RptObject.cxx | 4 +- reportdesign/source/core/sdr/RptObjectListener.cxx | 4 +- reportdesign/source/core/sdr/UndoEnv.cxx | 12 +- reportdesign/source/filter/xml/dbloader2.cxx | 10 +- reportdesign/source/filter/xml/dbloader2.hxx | 12 +- reportdesign/source/filter/xml/xmlExport.cxx | 26 +- reportdesign/source/filter/xml/xmlExport.hxx | 26 +- .../source/filter/xml/xmlExportDocumentHandler.cxx | 32 +- .../source/filter/xml/xmlExportDocumentHandler.hxx | 32 +- .../source/filter/xml/xmlImportDocumentHandler.cxx | 32 +- .../source/filter/xml/xmlImportDocumentHandler.hxx | 30 +- reportdesign/source/filter/xml/xmlfilter.cxx | 24 +- reportdesign/source/filter/xml/xmlfilter.hxx | 30 +- reportdesign/source/ui/dlg/AddField.cxx | 8 +- reportdesign/source/ui/dlg/GroupsSorting.cxx | 26 +- reportdesign/source/ui/dlg/Navigator.cxx | 32 +- reportdesign/source/ui/inc/AddField.hxx | 8 +- reportdesign/source/ui/inc/DataProviderHandler.hxx | 46 +- reportdesign/source/ui/inc/DefaultInspection.hxx | 28 +- reportdesign/source/ui/inc/FixedTextColor.hxx | 4 +- .../source/ui/inc/FormattedFieldBeautifier.hxx | 2 +- reportdesign/source/ui/inc/GeometryHandler.hxx | 50 +- reportdesign/source/ui/inc/GroupsSorting.hxx | 2 +- .../source/ui/inc/ReportComponentHandler.hxx | 46 +- reportdesign/source/ui/inc/ReportController.hxx | 58 +- .../source/ui/inc/ReportControllerObserver.hxx | 12 +- reportdesign/source/ui/inc/ReportSection.hxx | 2 +- reportdesign/source/ui/inc/ReportWindow.hxx | 2 +- reportdesign/source/ui/inc/ScrollHelper.hxx | 2 +- reportdesign/source/ui/inc/SectionWindow.hxx | 3 +- reportdesign/source/ui/inc/statusbarcontroller.hxx | 32 +- reportdesign/source/ui/inc/toolboxcontroller.hxx | 28 +- .../source/ui/inspection/DataProviderHandler.cxx | 46 +- .../source/ui/inspection/DefaultInspection.cxx | 28 +- .../source/ui/inspection/GeometryHandler.cxx | 50 +- .../ui/inspection/ReportComponentHandler.cxx | 46 +- .../source/ui/misc/statusbarcontroller.cxx | 28 +- reportdesign/source/ui/misc/toolboxcontroller.cxx | 28 +- reportdesign/source/ui/report/FixedTextColor.cxx | 4 +- .../source/ui/report/FormattedFieldBeautifier.cxx | 2 +- reportdesign/source/ui/report/ReportController.cxx | 55 +- .../source/ui/report/ReportControllerObserver.cxx | 12 +- reportdesign/source/ui/report/ReportSection.cxx | 2 +- reportdesign/source/ui/report/ReportWindow.cxx | 2 +- reportdesign/source/ui/report/ScrollHelper.cxx | 1 - reportdesign/source/ui/report/SectionWindow.cxx | 1 - salhelper/source/condition.cxx | 3 - sax/inc/xml2utf.hxx | 6 +- sax/qa/cppunit/parser.cxx | 6 +- sax/qa/cppunit/xmlimport.cxx | 49 +- sax/source/expatwrap/sax_expat.cxx | 62 +- sax/source/expatwrap/saxwriter.cxx | 142 ++-- sax/source/expatwrap/xml2utf.cxx | 1 - sax/source/fastparser/fastparser.cxx | 75 +- sax/source/fastparser/legacyfastparser.cxx | 80 +- sax/source/tools/fastattribs.cxx | 14 +- sc/inc/AccessibleFilterMenu.hxx | 66 +- sc/inc/AccessibleFilterMenuItem.hxx | 33 +- sc/inc/AccessibleFilterTopWindow.hxx | 9 +- sc/inc/AccessibleGlobal.hxx | 12 +- sc/inc/addruno.hxx | 44 +- sc/inc/afmtuno.hxx | 163 +--- sc/inc/appluno.hxx | 194 ++--- sc/inc/cellsuno.hxx | 921 +++++++-------------- sc/inc/chart2uno.hxx | 167 ++-- sc/inc/chartuno.hxx | 82 +- sc/inc/confuno.hxx | 44 +- sc/inc/cursuno.hxx | 63 +- sc/inc/dapiuno.hxx | 497 ++++------- sc/inc/datauno.hxx | 311 +++---- sc/inc/defltuno.hxx | 61 +- sc/inc/dispuno.hxx | 36 +- sc/inc/docuno.hxx | 545 ++++-------- sc/inc/dptabsrc.hxx | 341 +++----- sc/inc/eventuno.hxx | 31 +- sc/inc/fielduno.hxx | 147 +--- sc/inc/filtuno.hxx | 31 +- sc/inc/fmtuno.hxx | 170 ++-- sc/inc/funcuno.hxx | 50 +- sc/inc/linkuno.hxx | 338 +++----- sc/inc/miscuno.hxx | 48 +- sc/inc/nameuno.hxx | 224 ++--- sc/inc/notesuno.hxx | 60 +- sc/inc/optuno.hxx | 13 +- sc/inc/pageuno.hxx | 12 +- sc/inc/shapeuno.hxx | 129 +-- sc/inc/srchuno.hxx | 57 +- sc/inc/styleuno.hxx | 248 ++---- sc/inc/targuno.hxx | 80 +- sc/inc/textuno.hxx | 99 +-- sc/inc/tokenuno.hxx | 51 +- sc/inc/viewuno.hxx | 226 ++--- sc/source/core/data/dptabsrc.cxx | 99 +-- sc/source/core/inc/addinlis.hxx | 15 +- sc/source/core/tool/addinlis.cxx | 2 - sc/source/filter/excel/excimp8.cxx | 16 +- sc/source/filter/excel/xestream.cxx | 5 +- sc/source/filter/excel/xistyle.cxx | 8 +- sc/source/filter/inc/excelfilter.hxx | 7 +- sc/source/filter/inc/ooxformulaparser.hxx | 19 +- sc/source/filter/inc/xestream.hxx | 7 +- sc/source/filter/oox/excelfilter.cxx | 6 +- sc/source/filter/oox/ooxformulaparser.cxx | 14 +- sc/source/filter/orcus/filterdetect.cxx | 16 +- sc/source/filter/xml/XMLCodeNameProvider.cxx | 6 - sc/source/filter/xml/XMLCodeNameProvider.hxx | 17 +- sc/source/filter/xml/XMLEmptyContext.cxx | 1 - sc/source/filter/xml/XMLEmptyContext.hxx | 3 +- sc/source/filter/xml/importcontext.cxx | 3 - sc/source/filter/xml/importcontext.hxx | 9 +- sc/source/filter/xml/xmlbodyi.cxx | 3 - sc/source/filter/xml/xmlbodyi.hxx | 9 +- sc/source/filter/xml/xmlcelli.cxx | 1 - sc/source/filter/xml/xmlcelli.hxx | 3 +- sc/source/filter/xml/xmlexprt.cxx | 5 - sc/source/filter/xml/xmlexprt.hxx | 10 +- sc/source/filter/xml/xmlimprt.cxx | 48 +- sc/source/filter/xml/xmlimprt.hxx | 15 +- sc/source/filter/xml/xmlrowi.cxx | 4 - sc/source/filter/xml/xmlrowi.hxx | 12 +- sc/source/filter/xml/xmltabi.cxx | 2 - sc/source/filter/xml/xmltabi.hxx | 6 +- sc/source/ui/Accessibility/AccessibleCell.cxx | 16 +- sc/source/ui/Accessibility/AccessibleCellBase.cxx | 18 - .../ui/Accessibility/AccessibleContextBase.cxx | 39 - .../ui/Accessibility/AccessibleCsvControl.cxx | 132 +-- sc/source/ui/Accessibility/AccessibleDocument.cxx | 41 +- .../AccessibleDocumentPagePreview.cxx | 19 +- .../ui/Accessibility/AccessibleEditObject.cxx | 26 - .../ui/Accessibility/AccessibleFilterMenu.cxx | 27 +- .../ui/Accessibility/AccessibleFilterMenuItem.cxx | 13 +- .../ui/Accessibility/AccessibleFilterTopWindow.cxx | 6 +- sc/source/ui/Accessibility/AccessibleGlobal.cxx | 6 +- .../ui/Accessibility/AccessiblePageHeader.cxx | 18 +- .../ui/Accessibility/AccessiblePageHeaderArea.cxx | 12 - .../ui/Accessibility/AccessiblePreviewCell.cxx | 15 +- .../Accessibility/AccessiblePreviewHeaderCell.cxx | 30 +- .../ui/Accessibility/AccessiblePreviewTable.cxx | 44 +- .../ui/Accessibility/AccessibleSpreadsheet.cxx | 30 - sc/source/ui/Accessibility/AccessibleTableBase.cxx | 46 - .../ui/Accessibility/DrawModelBroadcaster.cxx | 2 - sc/source/ui/app/drwtrans.cxx | 2 +- sc/source/ui/app/transobj.cxx | 2 +- sc/source/ui/docshell/macromgr.cxx | 8 +- sc/source/ui/inc/AccessibleCell.hxx | 39 +- sc/source/ui/inc/AccessibleCellBase.hxx | 55 +- sc/source/ui/inc/AccessibleContextBase.hxx | 114 +-- sc/source/ui/inc/AccessibleCsvControl.hxx | 264 +++--- sc/source/ui/inc/AccessibleDocument.hxx | 89 +- sc/source/ui/inc/AccessibleDocumentPagePreview.hxx | 41 +- sc/source/ui/inc/AccessibleEditObject.hxx | 73 +- sc/source/ui/inc/AccessiblePageHeader.hxx | 29 +- sc/source/ui/inc/AccessiblePageHeaderArea.hxx | 30 +- sc/source/ui/inc/AccessiblePreviewCell.hxx | 26 +- sc/source/ui/inc/AccessiblePreviewHeaderCell.hxx | 47 +- sc/source/ui/inc/AccessiblePreviewTable.hxx | 121 +-- sc/source/ui/inc/AccessibleSpreadsheet.hxx | 103 +-- sc/source/ui/inc/AccessibleTableBase.hxx | 159 +--- sc/source/ui/inc/ChartRangeSelectionListener.hxx | 15 +- sc/source/ui/inc/DrawModelBroadcaster.hxx | 6 +- sc/source/ui/inc/condformatuno.hxx | 305 ++----- sc/source/ui/inc/drwtrans.hxx | 2 +- sc/source/ui/inc/transobj.hxx | 2 +- sc/source/ui/sidebar/ScPanelFactory.cxx | 7 - sc/source/ui/sidebar/ScPanelFactory.hxx | 15 +- .../ui/unoobj/ChartRangeSelectionListener.cxx | 2 - sc/source/ui/unoobj/addruno.cxx | 10 +- sc/source/ui/unoobj/afmtuno.cxx | 46 +- sc/source/ui/unoobj/appluno.cxx | 29 +- sc/source/ui/unoobj/celllistsource.cxx | 24 +- sc/source/ui/unoobj/celllistsource.hxx | 24 +- sc/source/ui/unoobj/cellsuno.cxx | 404 +++------ sc/source/ui/unoobj/cellvaluebinding.cxx | 26 +- sc/source/ui/unoobj/cellvaluebinding.hxx | 26 +- sc/source/ui/unoobj/chart2uno.cxx | 60 +- sc/source/ui/unoobj/chartuno.cxx | 36 +- sc/source/ui/unoobj/condformatuno.cxx | 113 --- sc/source/ui/unoobj/confuno.cxx | 10 +- sc/source/ui/unoobj/cursuno.cxx | 36 +- sc/source/ui/unoobj/dapiuno.cxx | 160 +--- sc/source/ui/unoobj/datauno.cxx | 102 +-- sc/source/ui/unoobj/defltuno.cxx | 11 - sc/source/ui/unoobj/dispuno.cxx | 12 - sc/source/ui/unoobj/docuno.cxx | 189 +---- sc/source/ui/unoobj/eventuno.cxx | 11 +- sc/source/ui/unoobj/exceldetect.cxx | 7 +- sc/source/ui/unoobj/exceldetect.hxx | 9 +- sc/source/ui/unoobj/fielduno.cxx | 51 +- sc/source/ui/unoobj/filtuno.cxx | 10 +- sc/source/ui/unoobj/fmtuno.cxx | 60 +- sc/source/ui/unoobj/funcuno.cxx | 12 +- sc/source/ui/unoobj/linkuno.cxx | 109 +-- sc/source/ui/unoobj/miscuno.cxx | 16 +- sc/source/ui/unoobj/nameuno.cxx | 75 +- sc/source/ui/unoobj/notesuno.cxx | 27 +- sc/source/ui/unoobj/optuno.cxx | 5 - sc/source/ui/unoobj/pageuno.cxx | 4 - sc/source/ui/unoobj/scdetect.cxx | 5 +- sc/source/ui/unoobj/scdetect.hxx | 9 +- sc/source/ui/unoobj/servuno.cxx | 15 +- sc/source/ui/unoobj/shapeuno.cxx | 75 +- sc/source/ui/unoobj/srchuno.cxx | 18 +- sc/source/ui/unoobj/styleuno.cxx | 92 +- sc/source/ui/unoobj/targuno.cxx | 28 +- sc/source/ui/unoobj/textuno.cxx | 53 +- sc/source/ui/unoobj/tokenuno.cxx | 8 - sc/source/ui/unoobj/unodoc.cxx | 2 +- sc/source/ui/unoobj/viewuno.cxx | 99 +-- sc/source/ui/vba/excelvbahelper.cxx | 24 +- sc/source/ui/vba/excelvbahelper.hxx | 18 +- sc/source/ui/vba/vbaapplication.cxx | 142 ++-- sc/source/ui/vba/vbaapplication.hxx | 152 ++-- sc/source/ui/vba/vbaassistant.cxx | 22 +- sc/source/ui/vba/vbaassistant.hxx | 22 +- sc/source/ui/vba/vbaaxes.cxx | 20 +- sc/source/ui/vba/vbaaxes.hxx | 8 +- sc/source/ui/vba/vbaaxis.cxx | 86 +- sc/source/ui/vba/vbaaxis.hxx | 86 +- sc/source/ui/vba/vbaborders.cxx | 50 +- sc/source/ui/vba/vbaborders.hxx | 22 +- sc/source/ui/vba/vbacharacters.cxx | 20 +- sc/source/ui/vba/vbacharacters.hxx | 20 +- sc/source/ui/vba/vbachart.cxx | 56 +- sc/source/ui/vba/vbachart.hxx | 56 +- sc/source/ui/vba/vbachartobject.cxx | 12 +- sc/source/ui/vba/vbachartobject.hxx | 12 +- sc/source/ui/vba/vbachartobjects.cxx | 14 +- sc/source/ui/vba/vbachartobjects.hxx | 10 +- sc/source/ui/vba/vbacomment.cxx | 28 +- sc/source/ui/vba/vbacomment.hxx | 28 +- sc/source/ui/vba/vbacomments.cxx | 8 +- sc/source/ui/vba/vbacomments.hxx | 4 +- sc/source/ui/vba/vbacondition.cxx | 10 +- sc/source/ui/vba/vbacondition.hxx | 12 +- sc/source/ui/vba/vbadialogs.cxx | 2 +- sc/source/ui/vba/vbadialogs.hxx | 2 +- sc/source/ui/vba/vbaeventshelper.cxx | 75 +- sc/source/ui/vba/vbaeventshelper.hxx | 26 +- sc/source/ui/vba/vbafont.cxx | 50 +- sc/source/ui/vba/vbafont.hxx | 48 +- sc/source/ui/vba/vbaformat.cxx | 62 +- sc/source/ui/vba/vbaformat.hxx | 70 +- sc/source/ui/vba/vbaformatcondition.cxx | 26 +- sc/source/ui/vba/vbaformatcondition.hxx | 24 +- sc/source/ui/vba/vbaformatconditions.cxx | 20 +- sc/source/ui/vba/vbaformatconditions.hxx | 16 +- sc/source/ui/vba/vbaglobals.cxx | 54 +- sc/source/ui/vba/vbaglobals.hxx | 55 +- sc/source/ui/vba/vbahyperlink.cxx | 36 +- sc/source/ui/vba/vbahyperlink.hxx | 36 +- sc/source/ui/vba/vbahyperlinks.cxx | 49 +- sc/source/ui/vba/vbahyperlinks.hxx | 13 +- sc/source/ui/vba/vbainterior.cxx | 22 +- sc/source/ui/vba/vbainterior.hxx | 22 +- sc/source/ui/vba/vbamenu.cxx | 10 +- sc/source/ui/vba/vbamenu.hxx | 10 +- sc/source/ui/vba/vbamenubar.cxx | 4 +- sc/source/ui/vba/vbamenubar.hxx | 4 +- sc/source/ui/vba/vbamenubars.cxx | 16 +- sc/source/ui/vba/vbamenubars.hxx | 10 +- sc/source/ui/vba/vbamenuitem.cxx | 12 +- sc/source/ui/vba/vbamenuitem.hxx | 12 +- sc/source/ui/vba/vbamenuitems.cxx | 18 +- sc/source/ui/vba/vbamenuitems.hxx | 12 +- sc/source/ui/vba/vbamenus.cxx | 18 +- sc/source/ui/vba/vbamenus.hxx | 12 +- sc/source/ui/vba/vbaname.cxx | 36 +- sc/source/ui/vba/vbaname.hxx | 36 +- sc/source/ui/vba/vbanames.cxx | 9 +- sc/source/ui/vba/vbanames.hxx | 8 +- sc/source/ui/vba/vbaoleobject.cxx | 30 +- sc/source/ui/vba/vbaoleobject.hxx | 30 +- sc/source/ui/vba/vbaoleobjects.cxx | 18 +- sc/source/ui/vba/vbaoleobjects.hxx | 6 +- sc/source/ui/vba/vbaoutline.cxx | 2 +- sc/source/ui/vba/vbaoutline.hxx | 2 +- sc/source/ui/vba/vbapagebreak.cxx | 12 +- sc/source/ui/vba/vbapagebreak.hxx | 14 +- sc/source/ui/vba/vbapagebreaks.cxx | 48 +- sc/source/ui/vba/vbapagebreaks.hxx | 16 +- sc/source/ui/vba/vbapagesetup.cxx | 86 +- sc/source/ui/vba/vbapagesetup.hxx | 86 +- sc/source/ui/vba/vbapalette.cxx | 8 +- sc/source/ui/vba/vbapane.cxx | 16 +- sc/source/ui/vba/vbapane.hxx | 16 +- sc/source/ui/vba/vbapivotcache.cxx | 2 +- sc/source/ui/vba/vbapivotcache.hxx | 2 +- sc/source/ui/vba/vbapivottable.cxx | 2 +- sc/source/ui/vba/vbapivottable.hxx | 2 +- sc/source/ui/vba/vbapivottables.cxx | 8 +- sc/source/ui/vba/vbapivottables.hxx | 4 +- sc/source/ui/vba/vbarange.cxx | 357 ++++---- sc/source/ui/vba/vbarange.hxx | 291 ++++--- sc/source/ui/vba/vbasheetobject.cxx | 104 +-- sc/source/ui/vba/vbasheetobject.hxx | 104 +-- sc/source/ui/vba/vbasheetobjects.cxx | 95 ++- sc/source/ui/vba/vbasheetobjects.hxx | 16 +- sc/source/ui/vba/vbastyle.cxx | 24 +- sc/source/ui/vba/vbastyle.hxx | 24 +- sc/source/ui/vba/vbastyles.cxx | 16 +- sc/source/ui/vba/vbastyles.hxx | 12 +- sc/source/ui/vba/vbatextboxshape.cxx | 6 +- sc/source/ui/vba/vbatextboxshape.hxx | 6 +- sc/source/ui/vba/vbatextframe.cxx | 4 +- sc/source/ui/vba/vbatextframe.hxx | 4 +- sc/source/ui/vba/vbatitle.hxx | 20 +- sc/source/ui/vba/vbavalidation.cxx | 42 +- sc/source/ui/vba/vbavalidation.hxx | 42 +- sc/source/ui/vba/vbawindow.cxx | 141 ++-- sc/source/ui/vba/vbawindow.hxx | 122 ++- sc/source/ui/vba/vbawindows.cxx | 32 +- sc/source/ui/vba/vbawindows.hxx | 6 +- sc/source/ui/vba/vbaworkbook.cxx | 36 +- sc/source/ui/vba/vbaworkbook.hxx | 36 +- sc/source/ui/vba/vbaworkbooks.cxx | 14 +- sc/source/ui/vba/vbaworkbooks.hxx | 10 +- sc/source/ui/vba/vbaworksheet.cxx | 139 ++-- sc/source/ui/vba/vbaworksheet.hxx | 150 ++-- sc/source/ui/vba/vbaworksheets.cxx | 47 +- sc/source/ui/vba/vbaworksheets.hxx | 25 +- sc/source/ui/vba/vbawsfunction.cxx | 14 +- sc/source/ui/vba/vbawsfunction.hxx | 14 +- scaddins/source/analysis/analysis.cxx | 164 ++-- scaddins/source/analysis/analysis.hxx | 275 +++--- scaddins/source/analysis/analysishelper.cxx | 133 ++- scaddins/source/analysis/analysishelper.hxx | 164 ++-- scaddins/source/analysis/bessel.cxx | 16 +- scaddins/source/analysis/bessel.hxx | 8 +- scaddins/source/analysis/financial.cxx | 68 +- scaddins/source/datefunc/datefunc.cxx | 50 +- scaddins/source/datefunc/datefunc.hxx | 56 +- scaddins/source/pricing/pricing.cxx | 40 +- scaddins/source/pricing/pricing.hxx | 40 +- sccomp/source/solver/CoinMPSolver.cxx | 10 +- sccomp/source/solver/LpsolveSolver.cxx | 10 +- sccomp/source/solver/SolverComponent.cxx | 33 +- sccomp/source/solver/SolverComponent.hxx | 55 +- scripting/source/basprov/baslibnode.cxx | 8 +- scripting/source/basprov/baslibnode.hxx | 12 +- scripting/source/basprov/basmethnode.cxx | 22 +- scripting/source/basprov/basmethnode.hxx | 35 +- scripting/source/basprov/basmodnode.cxx | 8 +- scripting/source/basprov/basmodnode.hxx | 12 +- scripting/source/basprov/basprov.cxx | 17 +- scripting/source/basprov/basprov.hxx | 27 +- scripting/source/basprov/basscript.cxx | 3 +- scripting/source/basprov/basscript.hxx | 9 +- scripting/source/dlgprov/DialogModelProvider.cxx | 38 +- scripting/source/dlgprov/DialogModelProvider.hxx | 38 +- scripting/source/dlgprov/dlgevtatt.cxx | 14 +- scripting/source/dlgprov/dlgevtatt.hxx | 27 +- scripting/source/dlgprov/dlgprov.cxx | 19 +- scripting/source/dlgprov/dlgprov.hxx | 33 +- scripting/source/protocolhandler/scripthandler.cxx | 11 - scripting/source/protocolhandler/scripthandler.hxx | 32 +- scripting/source/provider/ActiveMSPList.cxx | 1 - scripting/source/provider/ActiveMSPList.hxx | 3 +- .../source/provider/BrowseNodeFactoryImpl.cxx | 74 +- .../source/provider/BrowseNodeFactoryImpl.hxx | 15 +- scripting/source/provider/MasterScriptProvider.cxx | 28 +- scripting/source/provider/MasterScriptProvider.hxx | 46 +- .../provider/MasterScriptProviderFactory.cxx | 5 +- .../provider/MasterScriptProviderFactory.hxx | 12 +- scripting/source/provider/ProviderCache.cxx | 12 +- scripting/source/provider/ProviderCache.hxx | 13 +- scripting/source/provider/URIHelper.cxx | 8 - scripting/source/provider/URIHelper.hxx | 26 +- scripting/source/stringresource/stringresource.cxx | 148 +--- scripting/source/stringresource/stringresource.hxx | 434 +++------- scripting/source/vbaevents/eventhelper.cxx | 84 +- sd/inc/CustomAnimationEffect.hxx | 2 +- sd/inc/sdpage.hxx | 4 +- sd/inc/stlfamily.hxx | 60 +- sd/inc/stlpool.hxx | 28 +- sd/inc/stlsheet.hxx | 54 +- sd/inc/textapi.hxx | 2 +- sd/source/core/CustomAnimationEffect.cxx | 11 +- sd/source/core/annotations/Annotation.cxx | 80 +- .../core/annotations/AnnotationEnumeration.cxx | 8 +- sd/source/core/sdpage_animations.cxx | 4 +- sd/source/core/stlfamily.cxx | 60 +- sd/source/core/stlpool.cxx | 28 +- sd/source/core/stlsheet.cxx | 54 +- sd/source/core/text/textapi.cxx | 2 +- sd/source/filter/eppt/epptooxml.hxx | 4 +- sd/source/filter/eppt/pptx-epptooxml.cxx | 6 +- sd/source/filter/grf/sdgrffilter.cxx | 4 +- sd/source/filter/html/HtmlOptionsDialog.cxx | 35 +- .../accessibility/AccessibleDocumentViewBase.cxx | 31 - .../accessibility/AccessibleDrawDocumentView.cxx | 15 - .../ui/accessibility/AccessibleOutlineView.cxx | 11 +- sd/source/ui/accessibility/AccessiblePageShape.cxx | 12 - .../AccessiblePresentationGraphicShape.cxx | 4 - .../AccessiblePresentationOLEShape.cxx | 4 - .../accessibility/AccessiblePresentationShape.cxx | 3 - .../accessibility/AccessibleSlideSorterObject.cxx | 27 - .../ui/accessibility/AccessibleSlideSorterView.cxx | 37 - sd/source/ui/animations/motionpathtag.cxx | 6 +- sd/source/ui/animations/motionpathtag.hxx | 6 +- sd/source/ui/annotations/annotationmanager.cxx | 4 +- sd/source/ui/annotations/annotationmanagerimpl.hxx | 4 +- sd/source/ui/app/sdxfer.cxx | 2 +- sd/source/ui/controller/displaymodecontroller.cxx | 12 +- sd/source/ui/controller/slidelayoutcontroller.cxx | 13 +- sd/source/ui/controller/slidelayoutcontroller.hxx | 7 +- sd/source/ui/dlg/RemoteDialogClientBox.cxx | 1 - sd/source/ui/dlg/RemoteDialogClientBox.hxx | 3 +- sd/source/ui/dlg/sdtreelb.cxx | 2 +- .../ui/framework/configuration/Configuration.cxx | 11 - .../configuration/ConfigurationController.cxx | 20 - .../GenericConfigurationChangeRequest.cxx | 5 +- .../GenericConfigurationChangeRequest.hxx | 12 +- .../configuration/ResourceFactoryManager.cxx | 5 - .../configuration/ResourceFactoryManager.hxx | 15 +- .../ui/framework/configuration/ResourceId.cxx | 14 - .../ui/framework/configuration/UpdateRequest.cxx | 3 - .../ui/framework/configuration/UpdateRequest.hxx | 9 +- .../ui/framework/factories/BasicPaneFactory.cxx | 6 - .../ui/framework/factories/BasicPaneFactory.hxx | 18 +- .../ui/framework/factories/BasicToolBarFactory.cxx | 5 - .../ui/framework/factories/BasicToolBarFactory.hxx | 15 +- .../ui/framework/factories/BasicViewFactory.cxx | 3 - .../ui/framework/factories/BasicViewFactory.hxx | 9 +- .../ui/framework/factories/ChildWindowPane.cxx | 2 - .../ui/framework/factories/ChildWindowPane.hxx | 6 +- .../ui/framework/factories/FrameWindowPane.cxx | 1 - .../ui/framework/factories/FrameWindowPane.hxx | 3 +- .../ui/framework/factories/FullScreenPane.cxx | 5 - .../ui/framework/factories/FullScreenPane.hxx | 15 +- sd/source/ui/framework/factories/Pane.cxx | 11 - .../ui/framework/factories/PresentationFactory.cxx | 13 +- .../ui/framework/factories/ViewShellWrapper.cxx | 18 +- .../ui/framework/module/CenterViewFocusModule.cxx | 2 - .../ui/framework/module/CenterViewFocusModule.hxx | 6 +- sd/source/ui/framework/module/ModuleController.cxx | 3 - sd/source/ui/framework/module/ResourceManager.cxx | 2 - sd/source/ui/framework/module/ResourceManager.hxx | 6 +- sd/source/ui/framework/module/ShellStackGuard.cxx | 2 - sd/source/ui/framework/module/ShellStackGuard.hxx | 6 +- .../ui/framework/module/SlideSorterModule.cxx | 1 - .../ui/framework/module/SlideSorterModule.hxx | 3 +- sd/source/ui/framework/module/ToolBarModule.cxx | 2 - sd/source/ui/framework/module/ToolBarModule.hxx | 6 +- sd/source/ui/framework/module/ToolPanelModule.cxx | 1 - sd/source/ui/framework/module/ToolPanelModule.hxx | 3 +- sd/source/ui/framework/module/ViewTabBarModule.cxx | 2 - sd/source/ui/framework/module/ViewTabBarModule.hxx | 6 +- sd/source/ui/framework/tools/FrameworkHelper.cxx | 16 +- sd/source/ui/inc/AccessibleDocumentViewBase.hxx | 90 +- sd/source/ui/inc/AccessibleDrawDocumentView.hxx | 48 +- sd/source/ui/inc/AccessibleOutlineView.hxx | 27 +- sd/source/ui/inc/AccessiblePageShape.hxx | 36 +- .../ui/inc/AccessiblePresentationGraphicShape.hxx | 11 +- .../ui/inc/AccessiblePresentationOLEShape.hxx | 11 +- sd/source/ui/inc/AccessiblePresentationShape.hxx | 9 +- sd/source/ui/inc/AccessibleSlideSorterObject.hxx | 78 +- sd/source/ui/inc/AccessibleSlideSorterView.hxx | 103 +-- sd/source/ui/inc/DocumentRenderer.hxx | 9 +- sd/source/ui/inc/DrawController.hxx | 62 +- sd/source/ui/inc/DrawSubController.hxx | 6 +- sd/source/ui/inc/SdUnoDrawView.hxx | 42 +- sd/source/ui/inc/SdUnoOutlineView.hxx | 37 +- sd/source/ui/inc/SdUnoSlideView.hxx | 37 +- sd/source/ui/inc/ViewTabBar.hxx | 30 +- sd/source/ui/inc/facreg.hxx | 8 +- sd/source/ui/inc/framework/Configuration.hxx | 33 +- .../ui/inc/framework/ConfigurationController.hxx | 62 +- sd/source/ui/inc/framework/ModuleController.hxx | 9 +- sd/source/ui/inc/framework/Pane.hxx | 33 +- sd/source/ui/inc/framework/PresentationFactory.hxx | 15 +- sd/source/ui/inc/framework/ResourceId.hxx | 42 +- sd/source/ui/inc/framework/ViewShellWrapper.hxx | 39 +- sd/source/ui/inc/sdtreelb.hxx | 2 +- sd/source/ui/inc/sdxfer.hxx | 2 +- sd/source/ui/inc/slideshow.hxx | 38 +- sd/source/ui/inc/tools/PropertySet.hxx | 40 +- sd/source/ui/inc/tools/SlotStateListener.hxx | 9 +- sd/source/ui/inc/unomodel.hxx | 154 ++-- sd/source/ui/inc/unopage.hxx | 156 ++-- sd/source/ui/inc/unosrch.hxx | 44 +- sd/source/ui/presenter/PresenterCanvas.cxx | 92 +- sd/source/ui/presenter/PresenterCanvas.hxx | 120 +-- sd/source/ui/presenter/PresenterHelper.cxx | 9 - sd/source/ui/presenter/PresenterHelper.hxx | 27 +- sd/source/ui/presenter/PresenterPreviewCache.cxx | 10 - sd/source/ui/presenter/PresenterPreviewCache.hxx | 29 +- sd/source/ui/presenter/PresenterTextView.cxx | 2 - sd/source/ui/presenter/PresenterTextView.hxx | 5 +- sd/source/ui/presenter/SlideRenderer.cxx | 10 - sd/source/ui/presenter/SlideRenderer.hxx | 26 +- sd/source/ui/remotecontrol/Listener.cxx | 13 +- sd/source/ui/remotecontrol/Listener.hxx | 25 +- sd/source/ui/sidebar/PanelFactory.cxx | 4 - sd/source/ui/sidebar/PanelFactory.hxx | 6 +- sd/source/ui/slideshow/slideshow.cxx | 32 +- sd/source/ui/slideshow/slideshowimpl.cxx | 117 ++- sd/source/ui/slideshow/slideshowimpl.hxx | 118 +-- sd/source/ui/slideshow/slideshowviewimpl.cxx | 62 +- sd/source/ui/slideshow/slideshowviewimpl.hxx | 62 +- .../ui/slidesorter/controller/SlsListener.cxx | 5 - .../ui/slidesorter/controller/SlsListener.hxx | 15 +- .../ui/slidesorter/shell/SlideSorterService.cxx | 37 - .../ui/slidesorter/shell/SlideSorterService.hxx | 110 +-- sd/source/ui/tools/EventMultiplexer.cxx | 20 +- sd/source/ui/tools/PropertySet.cxx | 22 - sd/source/ui/tools/SlotStateListener.cxx | 3 - sd/source/ui/unoidl/DrawController.cxx | 33 +- sd/source/ui/unoidl/SdUnoDrawView.cxx | 23 +- sd/source/ui/unoidl/SdUnoOutlineView.cxx | 20 +- sd/source/ui/unoidl/SdUnoSlideView.cxx | 20 +- sd/source/ui/unoidl/UnoDocumentSettings.cxx | 68 +- sd/source/ui/unoidl/randomnode.cxx | 170 ++-- sd/source/ui/unoidl/sddetect.cxx | 8 +- sd/source/ui/unoidl/sddetect.hxx | 8 +- sd/source/ui/unoidl/unocpres.cxx | 30 +- sd/source/ui/unoidl/unocpres.hxx | 56 +- sd/source/ui/unoidl/unodoc.cxx | 8 +- sd/source/ui/unoidl/unolayer.cxx | 46 +- sd/source/ui/unoidl/unolayer.hxx | 64 +- sd/source/ui/unoidl/unomodel.cxx | 107 +-- sd/source/ui/unoidl/unomodule.cxx | 16 +- sd/source/ui/unoidl/unomodule.hxx | 20 +- sd/source/ui/unoidl/unoobj.cxx | 57 +- sd/source/ui/unoidl/unoobj.hxx | 41 +- sd/source/ui/unoidl/unopage.cxx | 124 +-- sd/source/ui/unoidl/unopback.cxx | 18 +- sd/source/ui/unoidl/unopback.hxx | 28 +- sd/source/ui/unoidl/unopool.cxx | 4 +- sd/source/ui/unoidl/unosrch.cxx | 27 +- sd/source/ui/view/DocumentRenderer.cxx | 3 - sd/source/ui/view/ViewTabBar.cxx | 10 - sd/source/ui/view/drviewsa.cxx | 4 +- sdext/source/minimizer/informationdialog.cxx | 2 - sdext/source/minimizer/informationdialog.hxx | 4 +- sdext/source/minimizer/optimizerdialog.cxx | 15 - sdext/source/minimizer/optimizerdialog.hxx | 30 +- sdext/source/minimizer/pppoptimizer.cxx | 7 +- sdext/source/minimizer/pppoptimizer.hxx | 14 +- sdext/source/minimizer/pppoptimizerdialog.cxx | 12 +- sdext/source/minimizer/pppoptimizerdialog.hxx | 29 +- sdext/source/minimizer/unodialog.cxx | 1 - sdext/source/minimizer/unodialog.hxx | 3 +- sdext/source/pdfimport/filterdet.cxx | 5 +- sdext/source/pdfimport/filterdet.hxx | 12 +- sdext/source/pdfimport/misc/pwdinteract.cxx | 24 +- sdext/source/pdfimport/pdfiadaptor.cxx | 16 +- sdext/source/pdfimport/pdfiadaptor.hxx | 30 +- sdext/source/pdfimport/sax/saxattrlist.cxx | 14 +- sdext/source/pdfimport/sax/saxattrlist.hxx | 14 +- sdext/source/pdfimport/test/outputwrap.hxx | 12 +- sdext/source/presenter/PresenterAccessibility.cxx | 235 ++---- sdext/source/presenter/PresenterAccessibility.hxx | 15 +- sdext/source/presenter/PresenterButton.cxx | 13 - sdext/source/presenter/PresenterButton.hxx | 39 +- sdext/source/presenter/PresenterController.cxx | 13 - sdext/source/presenter/PresenterController.hxx | 39 +- .../presenter/PresenterCurrentSlideObserver.cxx | 11 - .../presenter/PresenterCurrentSlideObserver.hxx | 23 +- .../presenter/PresenterFrameworkObserver.cxx | 2 - .../presenter/PresenterFrameworkObserver.hxx | 6 +- sdext/source/presenter/PresenterHelpView.cxx | 9 - sdext/source/presenter/PresenterHelpView.hxx | 27 +- sdext/source/presenter/PresenterNotesView.cxx | 12 - sdext/source/presenter/PresenterNotesView.hxx | 36 +- sdext/source/presenter/PresenterPane.cxx | 7 - sdext/source/presenter/PresenterPane.hxx | 21 +- sdext/source/presenter/PresenterPaneBase.cxx | 9 - sdext/source/presenter/PresenterPaneBase.hxx | 27 +- .../presenter/PresenterPaneBorderPainter.cxx | 6 - .../presenter/PresenterPaneBorderPainter.hxx | 18 +- sdext/source/presenter/PresenterPaneContainer.cxx | 1 - sdext/source/presenter/PresenterPaneContainer.hxx | 3 +- sdext/source/presenter/PresenterPaneFactory.cxx | 4 - sdext/source/presenter/PresenterPaneFactory.hxx | 11 +- .../source/presenter/PresenterProtocolHandler.cxx | 27 +- .../source/presenter/PresenterProtocolHandler.hxx | 20 +- sdext/source/presenter/PresenterScreen.cxx | 9 +- sdext/source/presenter/PresenterScreen.hxx | 7 +- sdext/source/presenter/PresenterScrollBar.cxx | 12 - sdext/source/presenter/PresenterScrollBar.hxx | 36 +- sdext/source/presenter/PresenterSlidePreview.cxx | 11 - sdext/source/presenter/PresenterSlidePreview.hxx | 32 +- sdext/source/presenter/PresenterSlideShowView.cxx | 32 +- sdext/source/presenter/PresenterSlideShowView.hxx | 93 +-- sdext/source/presenter/PresenterSlideSorter.cxx | 19 - sdext/source/presenter/PresenterSlideSorter.hxx | 57 +- sdext/source/presenter/PresenterSpritePane.cxx | 7 - sdext/source/presenter/PresenterSpritePane.hxx | 21 +- sdext/source/presenter/PresenterTimer.cxx | 1 - sdext/source/presenter/PresenterTimer.hxx | 3 +- sdext/source/presenter/PresenterToolBar.cxx | 37 +- sdext/source/presenter/PresenterToolBar.hxx | 63 +- sdext/source/presenter/PresenterViewFactory.cxx | 7 +- sdext/source/presenter/PresenterViewFactory.hxx | 11 +- sdext/source/presenter/PresenterWindowManager.cxx | 13 - sdext/source/presenter/PresenterWindowManager.hxx | 38 +- sfx2/source/appl/appdispatchprovider.cxx | 36 +- sfx2/source/appl/appinit.cxx | 24 +- sfx2/source/appl/appuno.cxx | 18 +- sfx2/source/appl/childwin.cxx | 2 +- sfx2/source/appl/helpdispatch.cxx | 6 +- sfx2/source/appl/helpdispatch.hxx | 6 +- sfx2/source/appl/helpinterceptor.cxx | 26 +- sfx2/source/appl/helpinterceptor.hxx | 32 +- sfx2/source/appl/imestatuswindow.cxx | 8 +- sfx2/source/appl/imestatuswindow.hxx | 6 +- sfx2/source/appl/macroloader.cxx | 13 +- sfx2/source/appl/sfxpicklist.cxx | 3 +- sfx2/source/appl/shutdownicon.cxx | 25 +- sfx2/source/appl/shutdownicon.hxx | 35 +- sfx2/source/appl/shutdowniconaqua.mm | 3 +- sfx2/source/appl/workwin.cxx | 5 - sfx2/source/appl/xpackcreator.cxx | 13 +- sfx2/source/bastyp/fltlst.cxx | 10 +- sfx2/source/bastyp/fltlst.hxx | 4 +- sfx2/source/control/sfxstatuslistener.cxx | 6 +- sfx2/source/control/statcach.cxx | 4 +- sfx2/source/control/thumbnailviewacc.cxx | 56 +- sfx2/source/control/thumbnailviewacc.hxx | 109 ++- sfx2/source/control/unoctitm.cxx | 19 +- sfx2/source/dialog/backingcomp.cxx | 80 +- sfx2/source/dialog/filedlghelper.cxx | 14 +- sfx2/source/dialog/filedlgimpl.hxx | 14 +- sfx2/source/dialog/mailmodel.cxx | 10 +- sfx2/source/doc/DocumentMetadataAccess.cxx | 30 +- sfx2/source/doc/Metadatable.cxx | 6 - sfx2/source/doc/SfxDocumentMetaData.cxx | 284 ++----- sfx2/source/doc/docfilt.cxx | 2 - sfx2/source/doc/docstoragemodifylistener.cxx | 4 +- sfx2/source/doc/doctemplates.cxx | 46 +- sfx2/source/doc/doctemplateslocal.cxx | 11 - sfx2/source/doc/doctemplateslocal.hxx | 25 +- sfx2/source/doc/docundomanager.cxx | 44 +- sfx2/source/doc/iframe.cxx | 70 +- sfx2/source/doc/objserv.cxx | 12 +- sfx2/source/doc/objxtor.cxx | 12 +- sfx2/source/doc/ownsubfilterservice.cxx | 19 +- sfx2/source/doc/printhelper.cxx | 26 +- sfx2/source/doc/printhelper.hxx | 14 +- sfx2/source/doc/sfxbasemodel.cxx | 262 ++---- sfx2/source/doc/sfxmodelfactory.cxx | 20 +- sfx2/source/inc/docundomanager.hxx | 44 +- sfx2/source/inc/eventsupplier.hxx | 22 +- sfx2/source/inc/fltoptint.hxx | 10 +- sfx2/source/inc/macroloader.hxx | 35 +- sfx2/source/inc/statcach.hxx | 4 +- sfx2/source/inc/workwin.hxx | 10 +- sfx2/source/notify/eventsupplier.cxx | 16 +- sfx2/source/notify/globalevents.cxx | 73 +- sfx2/source/sidebar/Accessible.cxx | 1 - sfx2/source/sidebar/ControllerItem.cxx | 6 +- sfx2/source/sidebar/SidebarController.cxx | 5 - sfx2/source/sidebar/SidebarPanelBase.cxx | 13 +- sfx2/source/sidebar/Theme.cxx | 23 - sfx2/source/sidebar/UnoDeck.cxx | 12 - sfx2/source/sidebar/UnoDecks.cxx | 13 +- sfx2/source/sidebar/UnoPanel.cxx | 13 - sfx2/source/sidebar/UnoPanels.cxx | 14 +- sfx2/source/sidebar/UnoSidebar.cxx | 6 - sfx2/source/statbar/stbitem.cxx | 8 - sfx2/source/toolbox/tbxitem.cxx | 17 +- sfx2/source/view/classificationcontroller.cxx | 24 +- sfx2/source/view/classificationhelper.cxx | 33 +- sfx2/source/view/frmload.cxx | 22 +- sfx2/source/view/ipclient.cxx | 76 +- sfx2/source/view/sfxbasecontroller.cxx | 102 +-- sfx2/source/view/userinputinterception.cxx | 8 +- sfx2/source/view/viewsh.cxx | 8 +- shell/source/backends/desktopbe/desktopbackend.cxx | 49 +- shell/source/backends/kde4be/kde4backend.cxx | 49 +- shell/source/backends/localebe/localebackend.cxx | 10 - shell/source/backends/localebe/localebackend.hxx | 43 +- shell/source/backends/macbe/macbackend.hxx | 43 +- shell/source/backends/macbe/macbackend.mm | 10 - shell/source/backends/wininetbe/wininetbackend.cxx | 10 - shell/source/backends/wininetbe/wininetbackend.hxx | 43 +- shell/source/cmdmail/cmdmailmsg.cxx | 19 - shell/source/cmdmail/cmdmailmsg.hxx | 57 +- shell/source/cmdmail/cmdmailsuppl.cxx | 6 - shell/source/cmdmail/cmdmailsuppl.hxx | 18 +- .../sessioninstall/SyncDbusSessionHelper.cxx | 11 +- .../sessioninstall/SyncDbusSessionHelper.hxx | 24 +- shell/source/unix/exec/shellexec.cxx | 4 - shell/source/unix/exec/shellexec.hxx | 12 +- shell/source/win32/SysShExec.cxx | 4 - shell/source/win32/SysShExec.hxx | 12 +- shell/source/win32/simplemail/smplmailclient.cxx | 2 - shell/source/win32/simplemail/smplmailclient.hxx | 6 +- shell/source/win32/simplemail/smplmailmsg.cxx | 14 - shell/source/win32/simplemail/smplmailmsg.hxx | 42 +- shell/source/win32/simplemail/smplmailsuppl.cxx | 4 - shell/source/win32/simplemail/smplmailsuppl.hxx | 12 +- slideshow/source/engine/eventmultiplexer.cxx | 35 +- .../source/engine/opengl/TransitionerImpl.cxx | 61 +- slideshow/source/engine/shapes/gdimtftools.cxx | 2 +- slideshow/source/engine/slideshowimpl.cxx | 67 +- slideshow/source/engine/slideview.cxx | 12 +- smoketest/smoketest.cxx | 10 +- sot/source/sdstor/ucbstorage.cxx | 31 +- sot/source/unoolestorage/xolesimplestorage.cxx | 36 - sot/source/unoolestorage/xolesimplestorage.hxx | 78 +- starmath/inc/unomodel.hxx | 26 +- starmath/source/accessibility.cxx | 70 +- starmath/source/accessibility.hxx | 134 +-- starmath/source/mathmlexport.cxx | 1 - starmath/source/mathmlexport.hxx | 2 +- starmath/source/mathmlimport.cxx | 5 - starmath/source/mathmlimport.hxx | 6 +- starmath/source/register.hxx | 8 +- starmath/source/smdetect.cxx | 10 +- starmath/source/smdetect.hxx | 10 +- starmath/source/unodoc.cxx | 2 +- starmath/source/unofilter.cxx | 24 +- starmath/source/unomodel.cxx | 17 +- stoc/source/corereflection/base.hxx | 118 +-- stoc/source/corereflection/crarray.cxx | 10 - stoc/source/corereflection/crbase.cxx | 19 +- stoc/source/corereflection/crcomp.cxx | 34 +- stoc/source/corereflection/crefl.cxx | 17 - stoc/source/corereflection/crenum.cxx | 33 +- stoc/source/corereflection/criface.cxx | 73 +- stoc/source/defaultregistry/defaultregistry.cxx | 147 ++-- stoc/source/implementationregistration/implreg.cxx | 36 +- stoc/source/inspect/introspection.cxx | 182 ++-- stoc/source/invocation/invocation.cxx | 110 +-- .../source/invocation_adapterfactory/iafactory.cxx | 21 +- stoc/source/javaloader/javaloader.cxx | 26 +- stoc/source/javavm/interact.cxx | 7 +- stoc/source/javavm/interact.hxx | 5 +- stoc/source/javavm/javavm.cxx | 26 +- stoc/source/javavm/javavm.hxx | 41 +- stoc/source/loader/dllcomponentloader.cxx | 20 +- stoc/source/namingservice/namingservice.cxx | 26 +- stoc/source/proxy_factory/proxyfac.cxx | 21 +- stoc/source/security/access_controller.cxx | 48 +- stoc/source/security/file_policy.cxx | 24 +- stoc/source/servicemanager/servicemanager.cxx | 198 ++--- stoc/source/simpleregistry/simpleregistry.cxx | 210 ++--- stoc/source/typeconv/convert.cxx | 30 +- .../uriproc/ExternalUriReferenceTranslator.cxx | 19 +- stoc/source/uriproc/UriReference.cxx | 29 +- stoc/source/uriproc/UriReference.hxx | 39 +- stoc/source/uriproc/UriReferenceFactory.cxx | 74 +- .../UriSchemeParser_vndDOTsunDOTstarDOTexpand.cxx | 66 +- .../UriSchemeParser_vndDOTsunDOTstarDOTscript.cxx | 87 +- .../uriproc/VndSunStarPkgUrlReferenceFactory.cxx | 15 +- svgio/inc/svgdocumenthandler.hxx | 16 +- svgio/source/svgreader/svgdocumenthandler.cxx | 16 +- svgio/source/svguno/xsvgparser.cxx | 16 +- svl/qa/unit/test_URIHelper.cxx | 30 +- svl/source/config/itemholder2.cxx | 1 - svl/source/config/itemholder2.hxx | 3 +- svl/source/fsstor/fsfactory.cxx | 7 - svl/source/fsstor/fsstorage.cxx | 134 --- svl/source/fsstor/fsstorage.hxx | 216 +---- svl/source/fsstor/oinputstreamcontainer.cxx | 32 - svl/source/fsstor/oinputstreamcontainer.hxx | 35 +- svl/source/fsstor/ostreamcontainer.cxx | 49 -- svl/source/fsstor/ostreamcontainer.hxx | 49 +- svl/source/inc/fsfactory.hxx | 10 +- svl/source/inc/passwordcontainer.hxx | 90 +- svl/source/items/itemprop.cxx | 17 +- svl/source/items/style.cxx | 2 +- svl/source/numbers/numfmuno.cxx | 68 +- svl/source/numbers/numfmuno.hxx | 188 ++--- svl/source/numbers/numuno.cxx | 4 +- svl/source/numbers/supservs.cxx | 16 +- svl/source/numbers/supservs.hxx | 18 +- svl/source/passwordcontainer/passwordcontainer.cxx | 61 +- svl/source/uno/pathservice.cxx | 21 +- svtools/inc/vclxaccessibleheaderbar.hxx | 10 +- svtools/inc/vclxaccessibleheaderbaritem.hxx | 44 +- svtools/source/config/itemholder2.cxx | 1 - svtools/source/config/itemholder2.hxx | 3 +- svtools/source/control/accessibleruler.cxx | 55 +- svtools/source/control/toolbarmenu.cxx | 24 +- svtools/source/control/toolbarmenuacc.cxx | 104 +-- svtools/source/control/toolbarmenuimp.hxx | 118 +-- svtools/source/control/valueacc.cxx | 56 +- svtools/source/control/valueimp.hxx | 109 ++- svtools/source/control/vclxaccessibleheaderbar.cxx | 9 +- .../source/control/vclxaccessibleheaderbaritem.cxx | 42 +- svtools/source/filter/SvFilterOptionsDialog.cxx | 40 +- svtools/source/graphic/descriptor.cxx | 12 - svtools/source/graphic/descriptor.hxx | 18 +- svtools/source/graphic/graphic.cxx | 15 +- svtools/source/graphic/graphic.hxx | 24 +- svtools/source/graphic/graphicunofactory.cxx | 25 +- svtools/source/graphic/provider.cxx | 24 +- svtools/source/graphic/renderer.cxx | 33 +- svtools/source/graphic/transformer.cxx | 3 - svtools/source/graphic/transformer.hxx | 9 +- svtools/source/hatchwindow/documentcloser.cxx | 18 +- svtools/source/hatchwindow/hatchwindow.cxx | 11 +- svtools/source/hatchwindow/hatchwindowfactory.cxx | 12 +- svtools/source/inc/hatchwindow.hxx | 18 +- svtools/source/inc/unoiface.hxx | 214 ++--- svtools/source/java/javacontext.cxx | 3 +- svtools/source/java/javainteractionhandler.cxx | 3 +- svtools/source/misc/acceleratorexecute.cxx | 2 +- svtools/source/misc/cliplistener.cxx | 2 - svtools/source/misc/dialogclosedlistener.cxx | 4 +- svtools/source/misc/embedhlp.cxx | 29 +- svtools/source/misc/imageresourceaccess.cxx | 20 +- svtools/source/misc/openfiledroptargetlistener.cxx | 12 +- svtools/source/misc/transfer.cxx | 36 +- svtools/source/misc/transfer2.cxx | 16 +- svtools/source/uno/addrtempuno.cxx | 20 +- svtools/source/uno/framestatuslistener.cxx | 6 - svtools/source/uno/generictoolboxcontroller.cxx | 3 - svtools/source/uno/genericunodialog.cxx | 16 +- svtools/source/uno/popupmenucontrollerbase.cxx | 26 +- svtools/source/uno/popupwindowcontroller.cxx | 8 +- svtools/source/uno/statusbarcontroller.cxx | 16 +- svtools/source/uno/svtxgridcontrol.cxx | 52 +- svtools/source/uno/svtxgridcontrol.hxx | 54 +- svtools/source/uno/toolboxcontroller.cxx | 19 +- svtools/source/uno/treecontrolpeer.cxx | 96 +-- svtools/source/uno/treecontrolpeer.hxx | 88 +- svtools/source/uno/unoevent.cxx | 36 - svtools/source/uno/unogridcolumnfacade.cxx | 8 +- svtools/source/uno/unoiface.cxx | 192 ++--- svtools/source/uno/unoimap.cxx | 71 +- svtools/source/uno/wizard/unowizard.cxx | 76 +- svx/inc/AccessibleSvxFindReplaceDialog.hxx | 4 +- svx/inc/AccessibleTableShape.hxx | 176 ++-- svx/inc/unomlstr.hxx | 4 +- .../accessibility/AccessibleControlShape.cxx | 33 +- .../accessibility/AccessibleFrameSelector.cxx | 37 +- .../accessibility/AccessibleGraphicShape.cxx | 10 - svx/source/accessibility/AccessibleOLEShape.cxx | 13 - svx/source/accessibility/AccessibleShape.cxx | 77 +- .../AccessibleSvxFindReplaceDialog.cxx | 4 +- svx/source/accessibility/ChildrenManager.cxx | 5 - svx/source/accessibility/ChildrenManagerImpl.cxx | 13 +- svx/source/accessibility/ChildrenManagerImpl.hxx | 31 +- .../accessibility/GraphCtlAccessibleContext.cxx | 69 +- svx/source/accessibility/ShapeTypeHandler.cxx | 1 - svx/source/accessibility/charmapacc.cxx | 101 +-- .../accessibility/svxpixelctlaccessiblecontext.cxx | 99 +-- .../accessibility/svxrectctaccessiblecontext.cxx | 140 ++-- .../customshapes/EnhancedCustomShapeEngine.cxx | 32 +- .../customshapes/EnhancedCustomShapeHandle.cxx | 3 - .../customshapes/EnhancedCustomShapeHandle.hxx | 9 +- svx/source/dialog/SafeModeUI.cxx | 16 +- svx/source/dialog/crashreportui.cxx | 16 +- svx/source/dialog/docrecovery.cxx | 10 - svx/source/dialog/rubydialog.cxx | 10 +- svx/source/fmcomp/fmgridif.cxx | 235 +++--- svx/source/fmcomp/gridcell.cxx | 214 ++--- svx/source/fmcomp/gridctrl.cxx | 16 +- svx/source/form/datalistener.cxx | 12 +- svx/source/form/filtnav.cxx | 20 +- svx/source/form/fmdmod.cxx | 4 +- svx/source/form/fmdpage.cxx | 12 +- svx/source/form/fmexch.cxx | 2 +- svx/source/form/fmscriptingenv.cxx | 30 +- svx/source/form/fmshimp.cxx | 16 +- svx/source/form/fmsrcimp.cxx | 4 +- svx/source/form/fmtextcontrolfeature.cxx | 4 +- svx/source/form/fmtextcontrolshell.cxx | 32 +- svx/source/form/fmtools.cxx | 2 +- svx/source/form/fmundo.cxx | 20 +- svx/source/form/fmvwimp.cxx | 26 +- svx/source/form/formcontroller.cxx | 208 +++-- svx/source/form/formcontrolling.cxx | 8 +- svx/source/form/formdispatchinterceptor.cxx | 14 +- svx/source/form/formfeaturedispatcher.cxx | 6 +- svx/source/form/legacyformcontroller.cxx | 61 +- svx/source/form/navigatortreemodel.cxx | 10 +- svx/source/form/tabwin.cxx | 2 +- svx/source/form/xfm_addcondition.cxx | 8 +- svx/source/gallery2/galbrws2.cxx | 6 +- svx/source/inc/AccessibleFrameSelector.hxx | 52 +- svx/source/inc/GraphCtlAccessibleContext.hxx | 79 +- svx/source/inc/charmapacc.hxx | 140 ++-- svx/source/inc/coreservices.hxx | 24 +- svx/source/inc/datalistener.hxx | 12 +- svx/source/inc/docrecovery.hxx | 30 +- svx/source/inc/fmexch.hxx | 2 +- svx/source/inc/fmexpl.hxx | 10 +- svx/source/inc/fmservs.hxx | 9 +- svx/source/inc/fmshimp.hxx | 16 +- svx/source/inc/fmtextcontrolfeature.hxx | 4 +- svx/source/inc/fmundo.hxx | 12 +- svx/source/inc/fmvwimp.hxx | 26 +- svx/source/inc/formcontroller.hxx | 203 +++-- svx/source/inc/formcontrolling.hxx | 8 +- svx/source/inc/formdispatchinterceptor.hxx | 16 +- svx/source/inc/formfeaturedispatcher.hxx | 6 +- svx/source/inc/gridcell.hxx | 250 +++--- svx/source/inc/svxpixelctlaccessiblecontext.hxx | 124 ++- svx/source/inc/svxrectctaccessiblecontext.hxx | 163 ++-- svx/source/inc/tabwin.hxx | 2 +- svx/source/inc/xfm_addcondition.hxx | 8 +- svx/source/inc/xmlxtexp.hxx | 3 +- svx/source/mnuctrls/smarttagmenu.cxx | 9 +- .../sdr/contact/viewobjectcontactofunocontrol.cxx | 40 +- svx/source/sdr/primitive2d/primitivefactory2d.cxx | 17 +- svx/source/sidebar/PanelFactory.cxx | 21 +- svx/source/sidebar/SelectionChangeHandler.cxx | 3 - .../sidebar/paragraph/ParaSpacingControl.cxx | 5 +- svx/source/sidebar/text/TextUnderlinePopup.cxx | 1 - svx/source/smarttags/SmartTagMgr.cxx | 6 +- svx/source/svdraw/svdoole2.cxx | 79 +- svx/source/svdraw/svdouno.cxx | 3 +- svx/source/table/accessiblecell.cxx | 44 +- svx/source/table/accessiblecell.hxx | 44 +- svx/source/table/accessibletableshape.cxx | 174 ++-- svx/source/table/cell.cxx | 83 +- svx/source/table/cell.hxx | 90 +- svx/source/table/cellcursor.cxx | 22 +- svx/source/table/cellcursor.hxx | 22 +- svx/source/table/cellrange.cxx | 6 +- svx/source/table/cellrange.hxx | 6 +- svx/source/table/propertyset.cxx | 32 +- svx/source/table/propertyset.hxx | 36 +- svx/source/table/svdotable.cxx | 8 +- svx/source/table/tablecolumn.cxx | 16 +- svx/source/table/tablecolumn.hxx | 16 +- svx/source/table/tablecolumns.cxx | 14 +- svx/source/table/tablecolumns.hxx | 14 +- svx/source/table/tablecontroller.cxx | 8 +- svx/source/table/tabledesign.cxx | 192 ++--- svx/source/table/tablemodel.cxx | 54 +- svx/source/table/tablemodel.hxx | 54 +- svx/source/table/tablerow.cxx | 16 +- svx/source/table/tablerow.hxx | 16 +- svx/source/table/tablerows.cxx | 14 +- svx/source/table/tablerows.hxx | 14 +- svx/source/tbxctrls/bulletsnumbering.cxx | 20 +- svx/source/tbxctrls/extrusioncontrols.cxx | 44 +- svx/source/tbxctrls/extrusioncontrols.hxx | 36 +- svx/source/tbxctrls/fontworkgallery.cxx | 40 +- svx/source/tbxctrls/linectrl.cxx | 12 +- svx/source/tbxctrls/tbcontrl.cxx | 40 +- svx/source/tbxctrls/tbunocontroller.cxx | 33 +- svx/source/tbxctrls/tbunosearchcontrollers.cxx | 264 +++--- svx/source/tbxctrls/tbxdrctl.cxx | 2 +- .../chinese_translation_unodialog.cxx | 32 +- .../chinese_translation_unodialog.hxx | 34 +- svx/source/unodraw/UnoGraphicExporter.cxx | 26 +- svx/source/unodraw/UnoNameItemTable.cxx | 9 +- svx/source/unodraw/UnoNameItemTable.hxx | 16 +- svx/source/unodraw/UnoNamespaceMap.cxx | 29 +- svx/source/unodraw/XPropertyTable.cxx | 106 +-- svx/source/unodraw/gluepts.cxx | 43 +- svx/source/unodraw/recoveryui.cxx | 16 +- svx/source/unodraw/shapeimpl.hxx | 34 +- svx/source/unodraw/tableshape.cxx | 2 - svx/source/unodraw/unobtabl.cxx | 10 +- svx/source/unodraw/unoctabl.cxx | 35 +- svx/source/unodraw/unodtabl.cxx | 10 +- svx/source/unodraw/unogtabl.cxx | 10 +- svx/source/unodraw/unohtabl.cxx | 10 +- svx/source/unodraw/unomlstr.cxx | 4 +- svx/source/unodraw/unomod.cxx | 52 +- svx/source/unodraw/unomtabl.cxx | 35 +- svx/source/unodraw/unopage.cxx | 24 +- svx/source/unodraw/unopool.cxx | 16 +- svx/source/unodraw/unoprov.cxx | 8 +- svx/source/unodraw/unoshap2.cxx | 95 +-- svx/source/unodraw/unoshap3.cxx | 43 +- svx/source/unodraw/unoshap4.cxx | 36 +- svx/source/unodraw/unoshape.cxx | 130 ++- svx/source/unodraw/unoshcol.cxx | 44 +- svx/source/unodraw/unottabl.cxx | 10 +- svx/source/unogallery/unogalitem.cxx | 18 - svx/source/unogallery/unogalitem.hxx | 24 +- svx/source/unogallery/unogaltheme.cxx | 15 - svx/source/unogallery/unogaltheme.hxx | 30 +- svx/source/unogallery/unogalthemeprovider.cxx | 39 +- svx/source/xml/xmleohlp.cxx | 15 +- svx/source/xml/xmlgrhlp.cxx | 63 +- svx/source/xml/xmlxtexp.cxx | 1 - sw/inc/SwSmartTagMgr.hxx | 4 +- sw/inc/TextCursorHelper.hxx | 2 +- sw/inc/accmap.hxx | 8 +- sw/inc/dlelstnr.hxx | 8 +- sw/inc/finalthreadmanager.hxx | 20 +- sw/inc/textboxhelper.hxx | 2 +- sw/inc/unochart.hxx | 144 ++-- sw/inc/unocoll.hxx | 142 ++-- sw/inc/unocrsrhelper.hxx | 61 +- sw/inc/unodraw.hxx | 107 ++- sw/inc/unofieldcoll.hxx | 52 +- sw/inc/unoframe.hxx | 129 ++- sw/inc/unoidxcoll.hxx | 33 +- sw/inc/unoparagraph.hxx | 138 +-- sw/inc/unoredline.hxx | 46 +- sw/inc/unoredlines.hxx | 26 +- sw/inc/unosett.hxx | 137 ++- sw/inc/unosrch.hxx | 42 +- sw/inc/unostyle.hxx | 183 ++-- sw/inc/unotbl.hxx | 360 ++++---- sw/inc/unotext.hxx | 147 +--- sw/inc/unotextbodyhf.hxx | 72 +- sw/inc/unotextcursor.hxx | 221 ++--- sw/inc/unotextrange.hxx | 101 +-- sw/inc/unotxdoc.hxx | 251 +++--- sw/qa/extras/tiledrendering/tiledrendering.cxx | 6 +- sw/source/core/access/acccell.cxx | 20 - sw/source/core/access/acccell.hxx | 64 +- sw/source/core/access/acccontext.cxx | 26 - sw/source/core/access/acccontext.hxx | 78 +- sw/source/core/access/accdoc.cxx | 36 - sw/source/core/access/accdoc.hxx | 88 +- sw/source/core/access/accembedded.cxx | 6 - sw/source/core/access/accembedded.hxx | 17 +- sw/source/core/access/accfootnote.cxx | 5 - sw/source/core/access/accfootnote.hxx | 14 +- sw/source/core/access/accgraphic.cxx | 5 - sw/source/core/access/accgraphic.hxx | 13 +- sw/source/core/access/accheaderfooter.cxx | 6 - sw/source/core/access/accheaderfooter.hxx | 17 +- sw/source/core/access/acchyperlink.cxx | 9 - sw/source/core/access/acchyperlink.hxx | 32 +- sw/source/core/access/accmap.cxx | 13 +- sw/source/core/access/accnotextframe.cxx | 46 +- sw/source/core/access/accnotextframe.hxx | 68 +- sw/source/core/access/accnotexthyperlink.cxx | 9 - sw/source/core/access/accnotexthyperlink.hxx | 32 +- sw/source/core/access/accpage.cxx | 5 - sw/source/core/access/accpage.hxx | 14 +- sw/source/core/access/accpara.cxx | 97 +-- sw/source/core/access/accpara.hxx | 203 ++--- sw/source/core/access/accpreview.cxx | 8 +- sw/source/core/access/accpreview.hxx | 15 +- sw/source/core/access/accselectionhelper.cxx | 11 - sw/source/core/access/accselectionhelper.hxx | 25 +- sw/source/core/access/acctable.cxx | 59 +- sw/source/core/access/acctable.hxx | 150 +--- sw/source/core/access/acctextframe.cxx | 15 - sw/source/core/access/acctextframe.hxx | 48 +- sw/source/core/access/textmarkuphelper.cxx | 10 - sw/source/core/access/textmarkuphelper.hxx | 14 +- sw/source/core/bastyp/SwSmartTagMgr.cxx | 4 +- sw/source/core/doc/textboxhelper.cxx | 2 +- sw/source/core/docnode/cancellablejob.cxx | 2 +- sw/source/core/docnode/cancellablejob.hxx | 2 +- sw/source/core/docnode/finalthreadmanager.cxx | 20 +- sw/source/core/inc/SwXMLBlockImport.hxx | 15 +- sw/source/core/inc/SwXTextDefaults.hxx | 39 +- sw/source/core/inc/dumpfilter.hxx | 21 +- sw/source/core/inc/unobookmark.hxx | 120 +-- sw/source/core/inc/unoevent.hxx | 9 +- sw/source/core/inc/unofield.hxx | 149 +--- sw/source/core/inc/unoflatpara.hxx | 72 +- sw/source/core/inc/unofootnote.hxx | 96 +-- sw/source/core/inc/unofreg.hxx | 4 +- sw/source/core/inc/unoidx.hxx | 153 +--- sw/source/core/inc/unometa.hxx | 150 +--- sw/source/core/inc/unoport.hxx | 102 +-- sw/source/core/inc/unorefmark.hxx | 69 +- sw/source/core/inc/unosection.hxx | 110 +-- sw/source/core/inc/unotextmarkup.hxx | 20 +- sw/source/core/layout/dumpfilter.cxx | 8 +- sw/source/core/ole/ndole.cxx | 12 +- sw/source/core/swg/SwXMLBlockImport.cxx | 25 +- sw/source/core/unocore/SwXTextDefaults.cxx | 14 - sw/source/core/unocore/TextCursorHelper.cxx | 1 - sw/source/core/unocore/unobkm.cxx | 48 +- sw/source/core/unocore/unochart.cxx | 66 -- sw/source/core/unocore/unocoll.cxx | 172 ++-- sw/source/core/unocore/unocrsrhelper.cxx | 5 - sw/source/core/unocore/unodraw.cxx | 111 +-- sw/source/core/unocore/unoevent.cxx | 3 - sw/source/core/unocore/unofield.cxx | 90 +- sw/source/core/unocore/unoflatpara.cxx | 42 +- sw/source/core/unocore/unoframe.cxx | 100 +-- sw/source/core/unocore/unoftn.cxx | 47 +- sw/source/core/unocore/unoidx.cxx | 162 +--- sw/source/core/unocore/unoobj.cxx | 127 +-- sw/source/core/unocore/unoobj2.cxx | 99 +-- sw/source/core/unocore/unoparagraph.cxx | 85 +- sw/source/core/unocore/unoport.cxx | 41 +- sw/source/core/unocore/unoportenum.cxx | 7 - sw/source/core/unocore/unoredline.cxx | 40 +- sw/source/core/unocore/unoredlines.cxx | 21 +- sw/source/core/unocore/unorefmk.cxx | 116 +-- sw/source/core/unocore/unosect.cxx | 60 +- sw/source/core/unocore/unosett.cxx | 108 +-- sw/source/core/unocore/unosrch.cxx | 41 +- sw/source/core/unocore/unostyle.cxx | 335 +++----- sw/source/core/unocore/unotbl.cxx | 263 ++---- sw/source/core/unocore/unotext.cxx | 107 +-- sw/source/core/unocore/unotextmarkup.cxx | 18 +- sw/source/filter/html/htmlform.cxx | 24 +- sw/source/filter/ww8/docxexportfilter.cxx | 4 +- sw/source/filter/ww8/docxexportfilter.hxx | 2 +- sw/source/filter/ww8/rtfexportfilter.cxx | 8 +- sw/source/filter/ww8/rtfexportfilter.hxx | 9 +- sw/source/filter/ww8/writerhelper.hxx | 11 +- sw/source/filter/xml/xmlexp.cxx | 1 - sw/source/filter/xml/xmlexp.hxx | 2 +- sw/source/filter/xml/xmlimp.cxx | 6 - sw/source/filter/xml/xmlimp.hxx | 12 +- sw/source/ui/envelp/mailmrge.cxx | 8 +- sw/source/ui/uno/swdetect.cxx | 8 +- sw/source/ui/uno/swdetect.hxx | 8 +- sw/source/ui/vba/vbaaddin.cxx | 14 +- sw/source/ui/vba/vbaaddin.hxx | 14 +- sw/source/ui/vba/vbaaddins.cxx | 6 +- sw/source/ui/vba/vbaaddins.hxx | 6 +- sw/source/ui/vba/vbaapplication.cxx | 34 +- sw/source/ui/vba/vbaapplication.hxx | 34 +- sw/source/ui/vba/vbaautotextentry.cxx | 10 +- sw/source/ui/vba/vbaautotextentry.hxx | 10 +- sw/source/ui/vba/vbabookmark.cxx | 14 +- sw/source/ui/vba/vbabookmark.hxx | 14 +- sw/source/ui/vba/vbabookmarks.cxx | 40 +- sw/source/ui/vba/vbabookmarks.hxx | 20 +- sw/source/ui/vba/vbaborders.cxx | 26 +- sw/source/ui/vba/vbaborders.hxx | 10 +- sw/source/ui/vba/vbacell.cxx | 18 +- sw/source/ui/vba/vbacell.hxx | 18 +- sw/source/ui/vba/vbacells.cxx | 38 +- sw/source/ui/vba/vbacells.hxx | 22 +- sw/source/ui/vba/vbacolumn.cxx | 10 +- sw/source/ui/vba/vbacolumn.hxx | 10 +- sw/source/ui/vba/vbacolumns.cxx | 24 +- sw/source/ui/vba/vbacolumns.hxx | 20 +- sw/source/ui/vba/vbadialogs.cxx | 2 +- sw/source/ui/vba/vbadialogs.hxx | 2 +- sw/source/ui/vba/vbadocument.cxx | 79 +- sw/source/ui/vba/vbadocument.hxx | 81 +- sw/source/ui/vba/vbadocumentproperties.cxx | 120 +-- sw/source/ui/vba/vbadocumentproperties.hxx | 8 +- sw/source/ui/vba/vbadocuments.cxx | 14 +- sw/source/ui/vba/vbadocuments.hxx | 10 +- sw/source/ui/vba/vbaeventshelper.cxx | 8 +- sw/source/ui/vba/vbaeventshelper.hxx | 8 +- sw/source/ui/vba/vbafield.cxx | 31 +- sw/source/ui/vba/vbafield.hxx | 17 +- sw/source/ui/vba/vbafind.cxx | 62 +- sw/source/ui/vba/vbafind.hxx | 62 +- sw/source/ui/vba/vbafont.cxx | 26 +- sw/source/ui/vba/vbafont.hxx | 22 +- sw/source/ui/vba/vbaframe.cxx | 4 +- sw/source/ui/vba/vbaframe.hxx | 4 +- sw/source/ui/vba/vbaframes.cxx | 10 +- sw/source/ui/vba/vbaframes.hxx | 4 +- sw/source/ui/vba/vbaglobals.cxx | 28 +- sw/source/ui/vba/vbaglobals.hxx | 28 +- sw/source/ui/vba/vbaheaderfooter.cxx | 12 +- sw/source/ui/vba/vbaheaderfooter.hxx | 12 +- sw/source/ui/vba/vbaheaderfooterhelper.cxx | 16 +- sw/source/ui/vba/vbaheaderfooterhelper.hxx | 16 +- sw/source/ui/vba/vbaheadersfooters.cxx | 20 +- sw/source/ui/vba/vbaheadersfooters.hxx | 8 +- sw/source/ui/vba/vbainformationhelper.cxx | 6 +- sw/source/ui/vba/vbainformationhelper.hxx | 6 +- sw/source/ui/vba/vbalistformat.cxx | 6 +- sw/source/ui/vba/vbalistformat.hxx | 6 +- sw/source/ui/vba/vbalistgalleries.cxx | 14 +- sw/source/ui/vba/vbalistgalleries.hxx | 10 +- sw/source/ui/vba/vbalistgallery.cxx | 4 +- sw/source/ui/vba/vbalistgallery.hxx | 4 +- sw/source/ui/vba/vbalisthelper.cxx | 30 +- sw/source/ui/vba/vbalisthelper.hxx | 30 +- sw/source/ui/vba/vbalistlevel.cxx | 48 +- sw/source/ui/vba/vbalistlevel.hxx | 48 +- sw/source/ui/vba/vbalistlevels.cxx | 14 +- sw/source/ui/vba/vbalistlevels.hxx | 10 +- sw/source/ui/vba/vbalisttemplate.cxx | 6 +- sw/source/ui/vba/vbalisttemplate.hxx | 6 +- sw/source/ui/vba/vbalisttemplates.cxx | 14 +- sw/source/ui/vba/vbalisttemplates.hxx | 10 +- sw/source/ui/vba/vbaoptions.cxx | 53 +- sw/source/ui/vba/vbaoptions.hxx | 55 +- sw/source/ui/vba/vbapagesetup.cxx | 24 +- sw/source/ui/vba/vbapagesetup.hxx | 24 +- sw/source/ui/vba/vbapalette.cxx | 8 +- sw/source/ui/vba/vbapane.cxx | 6 +- sw/source/ui/vba/vbapane.hxx | 6 +- sw/source/ui/vba/vbapanes.cxx | 16 +- sw/source/ui/vba/vbapanes.hxx | 4 +- sw/source/ui/vba/vbaparagraph.cxx | 28 +- sw/source/ui/vba/vbaparagraph.hxx | 14 +- sw/source/ui/vba/vbaparagraphformat.cxx | 66 +- sw/source/ui/vba/vbaparagraphformat.hxx | 66 +- sw/source/ui/vba/vbarange.cxx | 59 +- sw/source/ui/vba/vbarange.hxx | 63 +- sw/source/ui/vba/vbarangehelper.cxx | 9 +- sw/source/ui/vba/vbarangehelper.hxx | 10 +- sw/source/ui/vba/vbareplacement.cxx | 8 +- sw/source/ui/vba/vbareplacement.hxx | 8 +- sw/source/ui/vba/vbarevision.cxx | 8 +- sw/source/ui/vba/vbarevision.hxx | 8 +- sw/source/ui/vba/vbarevisions.cxx | 30 +- sw/source/ui/vba/vbarevisions.hxx | 8 +- sw/source/ui/vba/vbarow.cxx | 16 +- sw/source/ui/vba/vbarow.hxx | 16 +- sw/source/ui/vba/vbarows.cxx | 42 +- sw/source/ui/vba/vbarows.hxx | 38 +- sw/source/ui/vba/vbasection.cxx | 12 +- sw/source/ui/vba/vbasection.hxx | 12 +- sw/source/ui/vba/vbasections.cxx | 28 +- sw/source/ui/vba/vbasections.hxx | 6 +- sw/source/ui/vba/vbaselection.cxx | 109 ++- sw/source/ui/vba/vbaselection.hxx | 116 ++- sw/source/ui/vba/vbastyle.cxx | 40 +- sw/source/ui/vba/vbastyle.hxx | 42 +- sw/source/ui/vba/vbastyles.cxx | 26 +- sw/source/ui/vba/vbastyles.hxx | 11 +- sw/source/ui/vba/vbasystem.cxx | 6 +- sw/source/ui/vba/vbasystem.hxx | 6 +- sw/source/ui/vba/vbatable.cxx | 16 +- sw/source/ui/vba/vbatable.hxx | 16 +- sw/source/ui/vba/vbatablehelper.cxx | 22 +- sw/source/ui/vba/vbatablehelper.hxx | 22 +- sw/source/ui/vba/vbatableofcontents.cxx | 22 +- sw/source/ui/vba/vbatableofcontents.hxx | 22 +- sw/source/ui/vba/vbatables.cxx | 24 +- sw/source/ui/vba/vbatables.hxx | 6 +- sw/source/ui/vba/vbatablesofcontents.cxx | 24 +- sw/source/ui/vba/vbatablesofcontents.hxx | 8 +- sw/source/ui/vba/vbatabstop.cxx | 2 +- sw/source/ui/vba/vbatabstop.hxx | 2 +- sw/source/ui/vba/vbatabstops.cxx | 30 +- sw/source/ui/vba/vbatabstops.hxx | 13 +- sw/source/ui/vba/vbatemplate.cxx | 6 +- sw/source/ui/vba/vbatemplate.hxx | 6 +- sw/source/ui/vba/vbavariable.cxx | 12 +- sw/source/ui/vba/vbavariable.hxx | 12 +- sw/source/ui/vba/vbavariables.cxx | 8 +- sw/source/ui/vba/vbavariables.hxx | 6 +- sw/source/ui/vba/vbaview.cxx | 20 +- sw/source/ui/vba/vbaview.hxx | 20 +- sw/source/ui/vba/vbawindow.cxx | 18 +- sw/source/ui/vba/vbawindow.hxx | 19 +- sw/source/ui/vba/vbawrapformat.cxx | 30 +- sw/source/ui/vba/vbawrapformat.hxx | 30 +- sw/source/ui/vba/wordvbahelper.cxx | 16 +- sw/source/ui/vba/wordvbahelper.hxx | 16 +- sw/source/uibase/config/StoredChapterNumbering.cxx | 24 +- sw/source/uibase/dbui/dbmgr.cxx | 19 +- sw/source/uibase/dbui/dbtree.cxx | 16 +- sw/source/uibase/dbui/mailmergehelper.cxx | 48 +- sw/source/uibase/dbui/mailmergetoolbarcontrols.cxx | 40 +- sw/source/uibase/dbui/mmconfigitem.cxx | 12 +- sw/source/uibase/dochdl/swdtflvr.cxx | 2 +- sw/source/uibase/docvw/SidebarTxtControlAcc.cxx | 16 +- sw/source/uibase/docvw/SidebarWinAcc.cxx | 4 +- sw/source/uibase/docvw/srcedtw.cxx | 6 +- sw/source/uibase/inc/SwXFilterOptions.hxx | 31 +- sw/source/uibase/inc/mailmergehelper.hxx | 102 +-- sw/source/uibase/inc/swdtflvr.hxx | 2 +- sw/source/uibase/inc/uivwimp.hxx | 9 +- sw/source/uibase/inc/unoatxt.hxx | 125 ++- sw/source/uibase/inc/unodispatch.hxx | 30 +- sw/source/uibase/inc/unomailmerge.hxx | 38 +- sw/source/uibase/inc/unomod.hxx | 103 +-- sw/source/uibase/inc/unotxvw.hxx | 234 ++---- sw/source/uibase/sidebar/SwPanelFactory.cxx | 21 +- sw/source/uibase/uiview/uivwimp.cxx | 4 +- sw/source/uibase/uno/SwXDocumentSettings.cxx | 13 - sw/source/uibase/uno/SwXDocumentSettings.hxx | 38 +- sw/source/uibase/uno/SwXFilterOptions.cxx | 13 +- sw/source/uibase/uno/dlelstnr.cxx | 4 - sw/source/uibase/uno/unoatxt.cxx | 94 +-- sw/source/uibase/uno/unodispatch.cxx | 22 +- sw/source/uibase/uno/unodoc.cxx | 1 - sw/source/uibase/uno/unomailmerge.cxx | 32 +- sw/source/uibase/uno/unomod.cxx | 49 +- sw/source/uibase/uno/unomodule.cxx | 18 +- sw/source/uibase/uno/unomodule.hxx | 18 +- sw/source/uibase/uno/unotxdoc.cxx | 178 ++-- sw/source/uibase/uno/unotxvw.cxx | 109 +-- testtools/source/bridgetest/bridgetest.cxx | 15 +- testtools/source/bridgetest/constructors.cxx | 25 +- testtools/source/bridgetest/cppobj.cxx | 290 +++---- .../source/bridgetest/currentcontextchecker.cxx | 5 +- .../source/bridgetest/currentcontextchecker.hxx | 3 +- testtools/source/bridgetest/multi.hxx | 51 +- toolkit/inc/helper/unopropertyarrayhelper.hxx | 2 +- toolkit/source/awt/animatedimagespeer.cxx | 22 +- toolkit/source/awt/asynccallback.cxx | 16 +- toolkit/source/awt/stylesettings.cxx | 212 ++--- toolkit/source/awt/stylesettings.hxx | 212 ++--- toolkit/source/awt/vclxaccessiblecomponent.cxx | 44 +- toolkit/source/awt/vclxbitmap.cxx | 8 +- toolkit/source/awt/vclxcontainer.cxx | 15 +- toolkit/source/awt/vclxdevice.cxx | 24 +- toolkit/source/awt/vclxfont.cxx | 17 +- toolkit/source/awt/vclxgraphics.cxx | 63 +- toolkit/source/awt/vclxmenu.cxx | 44 - toolkit/source/awt/vclxpointer.cxx | 7 +- toolkit/source/awt/vclxprinter.cxx | 37 +- toolkit/source/awt/vclxregion.cxx | 26 +- toolkit/source/awt/vclxspinbutton.cxx | 32 +- toolkit/source/awt/vclxsystemdependentwindow.cxx | 4 +- toolkit/source/awt/vclxtabpagecontainer.cxx | 30 +- toolkit/source/awt/vclxtoolkit.cxx | 146 ++-- toolkit/source/awt/vclxtopwindow.cxx | 34 +- toolkit/source/awt/vclxwindow.cxx | 130 ++- toolkit/source/awt/vclxwindows.cxx | 648 +++++++-------- .../source/controls/accessiblecontrolcontext.cxx | 28 +- toolkit/source/controls/animatedimages.cxx | 80 +- .../source/controls/controlmodelcontainerbase.cxx | 98 ++- toolkit/source/controls/dialogcontrol.cxx | 127 ++- toolkit/source/controls/eventcontainer.cxx | 12 +- toolkit/source/controls/formattedcontrol.cxx | 18 +- toolkit/source/controls/geometrycontrolmodel.cxx | 20 +- .../controls/grid/defaultgridcolumnmodel.cxx | 49 +- .../source/controls/grid/defaultgriddatamodel.cxx | 92 +- toolkit/source/controls/grid/gridcolumn.cxx | 56 +- toolkit/source/controls/grid/gridcolumn.hxx | 56 +- toolkit/source/controls/grid/gridcontrol.cxx | 42 +- toolkit/source/controls/grid/gridcontrol.hxx | 54 +- .../source/controls/grid/grideventforwarder.cxx | 16 +- .../source/controls/grid/grideventforwarder.hxx | 16 +- .../source/controls/grid/sortablegriddatamodel.cxx | 140 ++-- toolkit/source/controls/roadmapcontrol.cxx | 47 +- toolkit/source/controls/roadmapentry.cxx | 7 +- toolkit/source/controls/spinningprogress.cxx | 16 +- toolkit/source/controls/stdtabcontroller.cxx | 23 +- toolkit/source/controls/stdtabcontrollermodel.cxx | 27 +- toolkit/source/controls/tabpagecontainer.cxx | 48 +- toolkit/source/controls/tabpagemodel.cxx | 22 +- toolkit/source/controls/tkscrollbar.cxx | 46 +- toolkit/source/controls/tkspinbutton.cxx | 94 +-- toolkit/source/controls/tree/treecontrol.cxx | 140 ++-- toolkit/source/controls/tree/treecontrol.hxx | 10 +- toolkit/source/controls/tree/treedatamodel.cxx | 132 +-- toolkit/source/controls/unocontrol.cxx | 112 +-- toolkit/source/controls/unocontrolcontainer.cxx | 52 +- .../source/controls/unocontrolcontainermodel.cxx | 6 +- toolkit/source/controls/unocontrolmodel.cxx | 42 +- toolkit/source/controls/unocontrols.cxx | 688 +++++++-------- toolkit/source/helper/listenermultiplexer.cxx | 16 +- toolkit/source/helper/unopropertyarrayhelper.cxx | 2 +- toolkit/source/helper/vclunohelper.cxx | 2 +- ucb/source/cacher/cachedcontentresultset.cxx | 131 +-- ucb/source/cacher/cachedcontentresultset.hxx | 246 ++---- ucb/source/cacher/cachedcontentresultsetstub.cxx | 20 - ucb/source/cacher/cachedcontentresultsetstub.hxx | 74 +- ucb/source/cacher/cacheddynamicresultset.cxx | 8 - ucb/source/cacher/cacheddynamicresultset.hxx | 42 +- ucb/source/cacher/cacheddynamicresultsetstub.cxx | 10 - ucb/source/cacher/cacheddynamicresultsetstub.hxx | 46 +- ucb/source/cacher/contentresultsetwrapper.cxx | 120 --- ucb/source/cacher/contentresultsetwrapper.hxx | 246 ++---- ucb/source/cacher/dynamicresultsetwrapper.cxx | 15 - ucb/source/cacher/dynamicresultsetwrapper.hxx | 50 +- ucb/source/core/FileAccess.cxx | 100 +-- ucb/source/core/cmdenv.cxx | 8 - ucb/source/core/cmdenv.hxx | 19 +- ucb/source/core/identify.cxx | 2 - ucb/source/core/identify.hxx | 6 +- ucb/source/core/provprox.cxx | 15 - ucb/source/core/provprox.hxx | 48 +- ucb/source/core/ucb.cxx | 21 - ucb/source/core/ucb.hxx | 82 +- ucb/source/core/ucbcmds.cxx | 42 +- ucb/source/core/ucbprops.cxx | 4 - ucb/source/core/ucbprops.hxx | 19 +- ucb/source/core/ucbstore.cxx | 72 +- ucb/source/core/ucbstore.hxx | 140 +--- ucb/source/sorter/sortdynres.cxx | 22 - ucb/source/sorter/sortdynres.hxx | 56 +- ucb/source/sorter/sortresult.cxx | 89 +- ucb/source/sorter/sortresult.hxx | 195 ++--- ucb/source/ucp/cmis/cmis_content.cxx | 27 +- ucb/source/ucp/cmis/cmis_content.hxx | 63 +- ucb/source/ucp/cmis/cmis_datasupplier.cxx | 2 +- ucb/source/ucp/cmis/cmis_datasupplier.hxx | 3 +- ucb/source/ucp/cmis/cmis_provider.cxx | 4 - ucb/source/ucp/cmis/cmis_provider.hxx | 22 +- ucb/source/ucp/cmis/cmis_repo_content.cxx | 11 +- ucb/source/ucp/cmis/cmis_repo_content.hxx | 24 +- ucb/source/ucp/cmis/std_inputstream.cxx | 13 +- ucb/source/ucp/cmis/std_inputstream.hxx | 43 +- ucb/source/ucp/cmis/std_outputstream.cxx | 8 +- ucb/source/ucp/cmis/std_outputstream.hxx | 25 +- ucb/source/ucp/expand/ucpexpand.cxx | 20 +- ucb/source/ucp/ext/ucpext_content.cxx | 9 +- ucb/source/ucp/ext/ucpext_content.hxx | 16 +- ucb/source/ucp/ext/ucpext_datasupplier.cxx | 2 +- ucb/source/ucp/ext/ucpext_datasupplier.hxx | 2 +- ucb/source/ucp/ext/ucpext_provider.cxx | 9 +- ucb/source/ucp/ext/ucpext_provider.hxx | 10 +- ucb/source/ucp/file/bc.cxx | 35 - ucb/source/ucp/file/bc.hxx | 94 +-- ucb/source/ucp/file/filcmd.cxx | 8 - ucb/source/ucp/file/filcmd.hxx | 20 +- ucb/source/ucp/file/filid.cxx | 5 - ucb/source/ucp/file/filid.hxx | 15 +- ucb/source/ucp/file/filinpstr.cxx | 26 - ucb/source/ucp/file/filinpstr.hxx | 50 +- ucb/source/ucp/file/filinsreq.hxx | 9 +- ucb/source/ucp/file/filprp.cxx | 4 - ucb/source/ucp/file/filprp.hxx | 10 +- ucb/source/ucp/file/filrow.cxx | 40 - ucb/source/ucp/file/filrow.hxx | 81 +- ucb/source/ucp/file/filrset.cxx | 79 -- ucb/source/ucp/file/filrset.hxx | 239 ++---- ucb/source/ucp/file/filstr.cxx | 43 - ucb/source/ucp/file/filstr.hxx | 78 +- ucb/source/ucp/file/filtask.cxx | 7 - ucb/source/ucp/file/filtask.hxx | 13 +- ucb/source/ucp/file/prov.cxx | 50 +- ucb/source/ucp/file/prov.hxx | 66 +- ucb/source/ucp/ftp/ftpcontent.cxx | 20 - ucb/source/ucp/ftp/ftpcontent.hxx | 47 +- ucb/source/ucp/ftp/ftpcontentidentifier.cxx | 11 - ucb/source/ucp/ftp/ftpcontentidentifier.hxx | 23 +- ucb/source/ucp/ftp/ftpcontentprovider.cxx | 12 - ucb/source/ucp/ftp/ftpcontentprovider.hxx | 29 +- ucb/source/ucp/ftp/ftpintreq.cxx | 4 - ucb/source/ucp/ftp/ftpintreq.hxx | 7 +- ucb/source/ucp/ftp/ftpresultsetbase.cxx | 80 +- ucb/source/ucp/ftp/ftpresultsetbase.hxx | 217 ++--- ucb/source/ucp/ftp/ftpurl.cxx | 16 - ucb/source/ucp/ftp/ftpurl.hxx | 29 +- ucb/source/ucp/gio/gio_content.cxx | 22 +- ucb/source/ucp/gio/gio_content.hxx | 53 +- ucb/source/ucp/gio/gio_datasupplier.cxx | 2 +- ucb/source/ucp/gio/gio_datasupplier.hxx | 3 +- ucb/source/ucp/gio/gio_inputstream.cxx | 8 - ucb/source/ucp/gio/gio_inputstream.hxx | 28 +- ucb/source/ucp/gio/gio_outputstream.cxx | 8 +- ucb/source/ucp/gio/gio_outputstream.hxx | 20 +- ucb/source/ucp/gio/gio_provider.cxx | 4 - ucb/source/ucp/gio/gio_provider.hxx | 22 +- ucb/source/ucp/gio/gio_seekable.cxx | 8 +- ucb/source/ucp/gio/gio_seekable.hxx | 20 +- ucb/source/ucp/hierarchy/hierarchycontent.cxx | 16 - ucb/source/ucp/hierarchy/hierarchycontent.hxx | 47 +- ucb/source/ucp/hierarchy/hierarchydatasource.cxx | 132 +-- ucb/source/ucp/hierarchy/hierarchydatasource.hxx | 41 +- ucb/source/ucp/hierarchy/hierarchydatasupplier.cxx | 1 - ucb/source/ucp/hierarchy/hierarchydatasupplier.hxx | 3 +- ucb/source/ucp/hierarchy/hierarchyprovider.cxx | 4 - ucb/source/ucp/hierarchy/hierarchyprovider.hxx | 26 +- ucb/source/ucp/image/ucpimage.cxx | 15 +- ucb/source/ucp/package/pkgcontent.cxx | 16 - ucb/source/ucp/package/pkgcontent.hxx | 47 +- ucb/source/ucp/package/pkgdatasupplier.cxx | 1 - ucb/source/ucp/package/pkgdatasupplier.hxx | 3 +- ucb/source/ucp/package/pkgprovider.cxx | 12 +- ucb/source/ucp/package/pkgprovider.hxx | 22 +- ucb/source/ucp/tdoc/tdoc_content.cxx | 34 - ucb/source/ucp/tdoc/tdoc_content.hxx | 70 +- ucb/source/ucp/tdoc/tdoc_datasupplier.cxx | 1 - ucb/source/ucp/tdoc/tdoc_datasupplier.hxx | 3 +- ucb/source/ucp/tdoc/tdoc_docmgr.cxx | 6 - ucb/source/ucp/tdoc/tdoc_docmgr.hxx | 16 +- .../ucp/tdoc/tdoc_documentcontentfactory.cxx | 5 - .../ucp/tdoc/tdoc_documentcontentfactory.hxx | 13 +- ucb/source/ucp/tdoc/tdoc_passwordrequest.cxx | 24 +- ucb/source/ucp/tdoc/tdoc_provider.cxx | 8 - ucb/source/ucp/tdoc/tdoc_provider.hxx | 38 +- ucb/source/ucp/tdoc/tdoc_stgelems.cxx | 158 ---- ucb/source/ucp/tdoc/tdoc_stgelems.hxx | 266 ++---- ucb/source/ucp/tdoc/tdoc_storage.cxx | 41 - ucb/source/ucp/tdoc/tdoc_storage.hxx | 57 +- ucb/source/ucp/webdav-neon/DAVResourceAccess.cxx | 26 - ucb/source/ucp/webdav-neon/DAVResourceAccess.hxx | 75 +- ucb/source/ucp/webdav-neon/DAVSession.hxx | 60 +- ucb/source/ucp/webdav-neon/DAVSessionFactory.cxx | 1 - ucb/source/ucp/webdav-neon/DAVSessionFactory.hxx | 3 +- ucb/source/ucp/webdav-neon/NeonInputStream.cxx | 26 - ucb/source/ucp/webdav-neon/NeonInputStream.hxx | 54 +- ucb/source/ucp/webdav-neon/NeonSession.cxx | 24 - ucb/source/ucp/webdav-neon/NeonSession.hxx | 72 +- ucb/source/ucp/webdav-neon/NeonUri.cxx | 2 - ucb/source/ucp/webdav-neon/NeonUri.hxx | 4 +- ucb/source/ucp/webdav-neon/webdavcontent.cxx | 43 - ucb/source/ucp/webdav-neon/webdavcontent.hxx | 104 +-- ucb/source/ucp/webdav-neon/webdavdatasupplier.cxx | 1 - ucb/source/ucp/webdav-neon/webdavdatasupplier.hxx | 3 +- ucb/source/ucp/webdav-neon/webdavprovider.cxx | 4 - ucb/source/ucp/webdav-neon/webdavprovider.hxx | 22 +- ucb/source/ucp/webdav/DAVResourceAccess.cxx | 24 - ucb/source/ucp/webdav/DAVResourceAccess.hxx | 69 +- ucb/source/ucp/webdav/DAVSession.hxx | 57 +- ucb/source/ucp/webdav/DAVSessionFactory.cxx | 1 - ucb/source/ucp/webdav/DAVSessionFactory.hxx | 3 +- ucb/source/ucp/webdav/SerfInputStream.cxx | 26 - ucb/source/ucp/webdav/SerfInputStream.hxx | 54 +- ucb/source/ucp/webdav/SerfSession.cxx | 23 - ucb/source/ucp/webdav/SerfSession.hxx | 69 +- ucb/source/ucp/webdav/SerfUri.cxx | 2 - ucb/source/ucp/webdav/SerfUri.hxx | 4 +- ucb/source/ucp/webdav/webdavcontent.cxx | 40 - ucb/source/ucp/webdav/webdavcontent.hxx | 99 +-- ucb/source/ucp/webdav/webdavdatasupplier.cxx | 1 - ucb/source/ucp/webdav/webdavdatasupplier.hxx | 3 +- ucb/source/ucp/webdav/webdavprovider.cxx | 4 - ucb/source/ucp/webdav/webdavprovider.hxx | 22 +- ucb/source/ucp/webdav/webdavresponseparser.cxx | 32 +- ucbhelper/source/client/activedatasink.cxx | 2 - ucbhelper/source/client/activedatastreamer.cxx | 4 - ucbhelper/source/client/commandenvironment.cxx | 2 - ucbhelper/source/client/content.cxx | 66 +- ucbhelper/source/client/interceptedinteraction.cxx | 1 - ucbhelper/source/client/proxydecider.cxx | 8 +- .../source/provider/cancelcommandexecution.cxx | 2 - ucbhelper/source/provider/contenthelper.cxx | 24 - ucbhelper/source/provider/contentidentifier.cxx | 5 - ucbhelper/source/provider/contentinfo.cxx | 12 - ucbhelper/source/provider/fd_inputstream.cxx | 24 - ucbhelper/source/provider/interactionrequest.cxx | 47 -- ucbhelper/source/provider/propertyvalueset.cxx | 22 - ucbhelper/source/provider/providerhelper.cxx | 3 - ucbhelper/source/provider/registerucb.cxx | 1 - ucbhelper/source/provider/resultset.cxx | 93 +-- ucbhelper/source/provider/resultsethelper.cxx | 16 - ucbhelper/source/provider/resultsetmetadata.cxx | 22 - .../provider/simplenameclashresolverequest.cxx | 20 +- .../accessibility/accessiblerelationsethelper.cxx | 30 +- .../accessibility/accessiblestatesethelper.cxx | 28 +- unotools/source/config/configitem.cxx | 8 +- unotools/source/config/eventcfg.cxx | 38 +- unotools/source/config/itemholder1.cxx | 1 - unotools/source/config/itemholder1.hxx | 3 +- unotools/source/config/useroptions.cxx | 8 +- unotools/source/misc/ServiceDocumenter.cxx | 3 - unotools/source/misc/ServiceDocumenter.hxx | 14 +- unotools/source/misc/ZipPackageHelper.cxx | 2 - unotools/source/misc/closeveto.cxx | 12 +- .../source/misc/desktopterminationobserver.cxx | 12 +- unotools/source/misc/eventlisteneradapter.cxx | 4 +- unotools/source/misc/mediadescriptor.cxx | 2 - unotools/source/misc/sharedunocomponent.cxx | 12 +- unotools/source/streaming/streamhelper.cxx | 11 +- unotools/source/streaming/streamwrap.cxx | 41 +- unotools/source/ucbhelper/XTempFile.hxx | 60 +- unotools/source/ucbhelper/progresshandlerwrap.cxx | 3 - unotools/source/ucbhelper/ucblockbytes.cxx | 70 +- unotools/source/ucbhelper/xtempfile.cxx | 20 - unoxml/inc/node.hxx | 87 +- unoxml/qa/unit/domtest.cxx | 30 +- unoxml/source/dom/attr.cxx | 12 +- unoxml/source/dom/attr.hxx | 85 +- unoxml/source/dom/attributesmap.cxx | 11 +- unoxml/source/dom/attributesmap.hxx | 23 +- unoxml/source/dom/cdatasection.cxx | 4 +- unoxml/source/dom/cdatasection.hxx | 100 +-- unoxml/source/dom/characterdata.cxx | 10 +- unoxml/source/dom/characterdata.hxx | 97 +-- unoxml/source/dom/childlist.cxx | 3 +- unoxml/source/dom/childlist.hxx | 5 +- unoxml/source/dom/comment.cxx | 4 +- unoxml/source/dom/comment.hxx | 97 +-- unoxml/source/dom/document.cxx | 33 +- unoxml/source/dom/document.hxx | 146 ++-- unoxml/source/dom/documentbuilder.cxx | 15 +- unoxml/source/dom/documentbuilder.hxx | 36 +- unoxml/source/dom/documentfragment.cxx | 4 +- unoxml/source/dom/documentfragment.hxx | 75 +- unoxml/source/dom/documenttype.cxx | 16 +- unoxml/source/dom/documenttype.hxx | 87 +- unoxml/source/dom/domimplementation.cxx | 3 - unoxml/source/dom/domimplementation.hxx | 9 +- unoxml/source/dom/element.cxx | 24 +- unoxml/source/dom/element.hxx | 123 +-- unoxml/source/dom/elementlist.cxx | 7 +- unoxml/source/dom/elementlist.hxx | 16 +- unoxml/source/dom/entitiesmap.cxx | 11 +- unoxml/source/dom/entitiesmap.hxx | 20 +- unoxml/source/dom/entity.cxx | 10 +- unoxml/source/dom/entity.hxx | 81 +- unoxml/source/dom/entityreference.cxx | 4 +- unoxml/source/dom/entityreference.hxx | 75 +- unoxml/source/dom/node.cxx | 29 - unoxml/source/dom/notation.cxx | 8 +- unoxml/source/dom/notation.hxx | 79 +- unoxml/source/dom/notationsmap.cxx | 10 +- unoxml/source/dom/notationsmap.hxx | 20 +- unoxml/source/dom/processinginstruction.cxx | 9 +- unoxml/source/dom/processinginstruction.hxx | 81 +- unoxml/source/dom/saxbuilder.cxx | 19 +- unoxml/source/dom/saxbuilder.hxx | 51 +- unoxml/source/dom/text.cxx | 3 +- unoxml/source/dom/text.hxx | 99 +-- unoxml/source/events/event.cxx | 20 +- unoxml/source/events/event.hxx | 20 +- unoxml/source/events/mouseevent.cxx | 47 +- unoxml/source/events/mouseevent.hxx | 50 +- unoxml/source/events/mutationevent.cxx | 32 +- unoxml/source/events/mutationevent.hxx | 33 +- unoxml/source/events/uievent.cxx | 26 +- unoxml/source/events/uievent.hxx | 27 +- unoxml/source/rdf/CBlankNode.cxx | 20 +- unoxml/source/rdf/CLiteral.cxx | 32 +- unoxml/source/rdf/CURI.cxx | 28 +- unoxml/source/rdf/librdf_repository.cxx | 171 +--- unoxml/source/xpath/nodelist.cxx | 3 +- unoxml/source/xpath/nodelist.hxx | 5 +- unoxml/source/xpath/xpathapi.cxx | 13 - unoxml/source/xpath/xpathapi.hxx | 37 +- unoxml/source/xpath/xpathobject.cxx | 20 +- unoxml/source/xpath/xpathobject.hxx | 21 +- uui/source/fltdlg.cxx | 2 +- uui/source/interactionhandler.cxx | 24 +- uui/source/passwordcontainer.cxx | 6 - uui/source/passwordcontainer.hxx | 15 +- uui/source/requeststringresolver.cxx | 4 - uui/source/requeststringresolver.hxx | 12 +- vbahelper/source/msforms/vbabutton.cxx | 30 +- vbahelper/source/msforms/vbabutton.hxx | 30 +- vbahelper/source/msforms/vbacheckbox.cxx | 22 +- vbahelper/source/msforms/vbacheckbox.hxx | 24 +- vbahelper/source/msforms/vbacombobox.cxx | 68 +- vbahelper/source/msforms/vbacombobox.hxx | 70 +- vbahelper/source/msforms/vbacontrol.cxx | 87 +- vbahelper/source/msforms/vbacontrol.hxx | 82 +- vbahelper/source/msforms/vbacontrols.cxx | 26 +- vbahelper/source/msforms/vbacontrols.hxx | 10 +- vbahelper/source/msforms/vbaframe.cxx | 16 +- vbahelper/source/msforms/vbaframe.hxx | 18 +- vbahelper/source/msforms/vbaimage.cxx | 4 +- vbahelper/source/msforms/vbaimage.hxx | 4 +- vbahelper/source/msforms/vbalabel.cxx | 22 +- vbahelper/source/msforms/vbalabel.hxx | 24 +- vbahelper/source/msforms/vbalistbox.cxx | 32 +- vbahelper/source/msforms/vbalistbox.hxx | 34 +- vbahelper/source/msforms/vbalistcontrolhelper.cxx | 12 +- vbahelper/source/msforms/vbalistcontrolhelper.hxx | 12 +- vbahelper/source/msforms/vbamultipage.cxx | 14 +- vbahelper/source/msforms/vbamultipage.hxx | 6 +- vbahelper/source/msforms/vbanewfont.cxx | 34 +- vbahelper/source/msforms/vbanewfont.hxx | 34 +- vbahelper/source/msforms/vbapages.cxx | 6 +- vbahelper/source/msforms/vbapages.hxx | 6 +- vbahelper/source/msforms/vbaprogressbar.cxx | 4 +- vbahelper/source/msforms/vbaprogressbar.hxx | 6 +- vbahelper/source/msforms/vbaradiobutton.cxx | 10 +- vbahelper/source/msforms/vbaradiobutton.hxx | 12 +- vbahelper/source/msforms/vbascrollbar.cxx | 20 +- vbahelper/source/msforms/vbascrollbar.hxx | 20 +- vbahelper/source/msforms/vbaspinbutton.cxx | 12 +- vbahelper/source/msforms/vbaspinbutton.hxx | 12 +- vbahelper/source/msforms/vbasystemaxcontrol.cxx | 6 - vbahelper/source/msforms/vbasystemaxcontrol.hxx | 12 +- vbahelper/source/msforms/vbatextbox.cxx | 40 +- vbahelper/source/msforms/vbatextbox.hxx | 42 +- vbahelper/source/msforms/vbatogglebutton.cxx | 34 +- vbahelper/source/msforms/vbatogglebutton.hxx | 36 +- vbahelper/source/msforms/vbauserform.cxx | 40 +- vbahelper/source/msforms/vbauserform.hxx | 40 +- vbahelper/source/vbahelper/vbaapplicationbase.cxx | 30 +- vbahelper/source/vbahelper/vbacolorformat.cxx | 8 +- vbahelper/source/vbahelper/vbacolorformat.hxx | 8 +- vbahelper/source/vbahelper/vbacommandbar.cxx | 44 +- vbahelper/source/vbahelper/vbacommandbar.hxx | 44 +- .../source/vbahelper/vbacommandbarcontrol.cxx | 32 +- .../source/vbahelper/vbacommandbarcontrol.hxx | 38 +- .../source/vbahelper/vbacommandbarcontrols.cxx | 32 +- .../source/vbahelper/vbacommandbarcontrols.hxx | 20 +- vbahelper/source/vbahelper/vbacommandbarhelper.cxx | 18 +- vbahelper/source/vbahelper/vbacommandbarhelper.hxx | 20 +- vbahelper/source/vbahelper/vbacommandbars.cxx | 18 +- vbahelper/source/vbahelper/vbacommandbars.hxx | 12 +- vbahelper/source/vbahelper/vbadialogbase.cxx | 2 +- vbahelper/source/vbahelper/vbadialogsbase.cxx | 4 +- vbahelper/source/vbahelper/vbadocumentbase.cxx | 22 +- vbahelper/source/vbahelper/vbadocumentsbase.cxx | 32 +- vbahelper/source/vbahelper/vbaeventshelperbase.cxx | 19 +- vbahelper/source/vbahelper/vbafillformat.cxx | 20 +- vbahelper/source/vbahelper/vbafillformat.hxx | 20 +- vbahelper/source/vbahelper/vbafontbase.cxx | 42 +- vbahelper/source/vbahelper/vbaglobalbase.cxx | 6 +- vbahelper/source/vbahelper/vbahelper.cxx | 37 +- vbahelper/source/vbahelper/vbalineformat.cxx | 50 +- vbahelper/source/vbahelper/vbalineformat.hxx | 50 +- vbahelper/source/vbahelper/vbapagesetupbase.cxx | 30 +- vbahelper/source/vbahelper/vbapictureformat.cxx | 15 +- vbahelper/source/vbahelper/vbapictureformat.hxx | 17 +- vbahelper/source/vbahelper/vbapropvalue.cxx | 4 +- vbahelper/source/vbahelper/vbashape.cxx | 85 +- vbahelper/source/vbahelper/vbashaperange.cxx | 66 +- vbahelper/source/vbahelper/vbashapes.cxx | 32 +- vbahelper/source/vbahelper/vbatextframe.cxx | 22 +- vbahelper/source/vbahelper/vbawindowbase.cxx | 32 +- vcl/inc/canvasbitmap.hxx | 66 +- vcl/inc/displayconnectiondispatch.hxx | 10 +- vcl/inc/dndeventdispatcher.hxx | 30 +- vcl/inc/dndlistenercontainer.hxx | 28 +- vcl/inc/osx/a11ylistener.hxx | 6 +- vcl/inc/unx/gtk/gtkinst.hxx | 55 +- vcl/osx/DragSource.cxx | 10 +- vcl/osx/DragSource.hxx | 17 +- vcl/osx/DragSourceContext.cxx | 4 - vcl/osx/DragSourceContext.hxx | 12 +- vcl/osx/DropTarget.cxx | 27 +- vcl/osx/DropTarget.hxx | 33 +- vcl/osx/OSXTransferable.cxx | 3 - vcl/osx/OSXTransferable.hxx | 9 +- vcl/osx/a11ylistener.cxx | 4 +- vcl/osx/clipboard.cxx | 16 +- vcl/osx/clipboard.hxx | 29 +- vcl/osx/documentfocuslistener.cxx | 13 +- vcl/osx/documentfocuslistener.hxx | 21 +- vcl/qa/cppunit/canvasbitmaptest.cxx | 121 +-- vcl/source/app/dndhelp.cxx | 38 +- vcl/source/app/session.cxx | 24 +- vcl/source/app/svmain.cxx | 8 +- vcl/source/app/unohelp2.cxx | 8 +- vcl/source/components/dtranscomp.cxx | 111 ++- vcl/source/components/fontident.cxx | 20 +- vcl/source/control/edit.cxx | 12 +- vcl/source/control/notebookbar.cxx | 8 +- vcl/source/edit/textview.cxx | 28 +- vcl/source/filter/FilterConfigCache.cxx | 1 - vcl/source/filter/graphicfilter.cxx | 8 +- vcl/source/gdi/pdfwriter_impl.cxx | 12 +- vcl/source/gdi/pdfwriter_impl2.cxx | 2 +- vcl/source/helper/canvasbitmap.cxx | 70 +- vcl/source/helper/canvastools.cxx | 23 +- vcl/source/helper/commandinfoprovider.cxx | 6 +- vcl/source/helper/displayconnectiondispatch.cxx | 10 +- vcl/source/uitest/uno/uiobject_uno.cxx | 8 - vcl/source/uitest/uno/uiobject_uno.hxx | 24 +- vcl/source/uitest/uno/uitest_uno.cxx | 20 +- vcl/source/window/dndeventdispatcher.cxx | 18 +- vcl/source/window/dndlistenercontainer.cxx | 19 +- vcl/unx/generic/dtrans/X11_clipboard.cxx | 9 - vcl/unx/generic/dtrans/X11_clipboard.hxx | 27 +- vcl/unx/generic/dtrans/X11_dndcontext.cxx | 18 +- vcl/unx/generic/dtrans/X11_dndcontext.hxx | 18 +- vcl/unx/generic/dtrans/X11_droptarget.cxx | 20 +- vcl/unx/generic/dtrans/X11_selection.cxx | 26 +- vcl/unx/generic/dtrans/X11_selection.hxx | 53 +- vcl/unx/generic/dtrans/X11_transferable.cxx | 3 - vcl/unx/generic/dtrans/X11_transferable.hxx | 12 +- vcl/unx/gtk/a11y/atkaction.cxx | 2 +- vcl/unx/gtk/a11y/atkcomponent.cxx | 2 +- vcl/unx/gtk/a11y/atkeditabletext.cxx | 2 +- vcl/unx/gtk/a11y/atkhypertext.cxx | 2 +- vcl/unx/gtk/a11y/atkimage.cxx | 2 +- vcl/unx/gtk/a11y/atklistener.cxx | 4 +- vcl/unx/gtk/a11y/atklistener.hxx | 6 +- vcl/unx/gtk/a11y/atkselection.cxx | 2 +- vcl/unx/gtk/a11y/atktable.cxx | 2 +- vcl/unx/gtk/a11y/atktext.cxx | 8 +- vcl/unx/gtk/a11y/atktextattributes.cxx | 2 +- vcl/unx/gtk/a11y/atkutil.cxx | 34 +- vcl/unx/gtk/a11y/atkvalue.cxx | 2 +- vcl/unx/gtk/fpicker/SalGtkFilePicker.cxx | 42 +- vcl/unx/gtk/fpicker/SalGtkFilePicker.hxx | 85 +- vcl/unx/gtk/fpicker/SalGtkFolderPicker.cxx | 12 +- vcl/unx/gtk/fpicker/SalGtkFolderPicker.hxx | 21 +- vcl/unx/gtk/fpicker/SalGtkPicker.cxx | 8 +- vcl/unx/gtk/fpicker/SalGtkPicker.hxx | 39 +- vcl/unx/gtk3/gtk3gtkframe.cxx | 17 +- vcl/unx/gtk3/gtk3gtkinst.cxx | 77 +- vcl/unx/kde4/KDE4FilePicker.cxx | 25 - vcl/unx/kde4/KDE4FilePicker.hxx | 87 +- winaccessibility/inc/AccComponentEventListener.hxx | 2 +- winaccessibility/inc/AccContainerEventListener.hxx | 2 +- .../inc/AccDescendantManagerEventListener.hxx | 2 +- winaccessibility/inc/AccDialogEventListener.hxx | 2 +- winaccessibility/inc/AccEventListener.hxx | 4 +- winaccessibility/inc/AccFrameEventListener.hxx | 2 +- winaccessibility/inc/AccListEventListener.hxx | 2 +- winaccessibility/inc/AccMenuEventListener.hxx | 2 +- winaccessibility/inc/AccParagraphEventListener.hxx | 2 +- winaccessibility/inc/AccTableEventListener.hxx | 2 +- winaccessibility/inc/AccTopWindowListener.hxx | 16 +- winaccessibility/inc/AccTreeEventListener.hxx | 2 +- winaccessibility/inc/AccWindowEventListener.hxx | 2 +- .../source/service/AccComponentEventListener.cxx | 1 - .../source/service/AccContainerEventListener.cxx | 1 - .../service/AccDescendantManagerEventListener.cxx | 1 - .../source/service/AccDialogEventListener.cxx | 1 - .../source/service/AccEventListener.cxx | 2 - .../source/service/AccFrameEventListener.cxx | 1 - .../source/service/AccListEventListener.cxx | 2 +- .../source/service/AccMenuEventListener.cxx | 1 - .../source/service/AccParagraphEventListener.cxx | 1 - .../source/service/AccTableEventListener.cxx | 1 - .../source/service/AccTopWindowListener.cxx | 16 +- .../source/service/AccTreeEventListener.cxx | 2 +- .../source/service/AccWindowEventListener.cxx | 2 +- .../source/service/msaaservice_impl.cxx | 33 +- writerfilter/source/dmapper/DomainMapper_Impl.cxx | 2 +- writerfilter/source/dmapper/DomainMapper_Impl.hxx | 2 +- writerfilter/source/dmapper/GraphicImport.cxx | 18 +- writerfilter/source/dmapper/ModelEventListener.cxx | 4 +- writerfilter/source/dmapper/ModelEventListener.hxx | 4 +- writerfilter/source/dmapper/PropertyMap.cxx | 5 - writerfilter/source/dmapper/PropertyMap.hxx | 7 +- writerfilter/source/filter/RtfFilter.cxx | 32 +- writerfilter/source/filter/WriterFilter.cxx | 32 +- .../source/filter/WriterFilterDetection.cxx | 20 +- .../source/ooxml/OOXMLFastContextHandler.cxx | 40 - .../source/ooxml/OOXMLFastContextHandler.hxx | 117 +-- .../source/ooxml/OOXMLFastDocumentHandler.cxx | 10 - .../source/ooxml/OOXMLFastDocumentHandler.hxx | 30 +- writerperfect/inc/ImportFilter.hxx | 15 +- .../source/calc/MSWorksCalcImportFilter.cxx | 4 - .../source/calc/MSWorksCalcImportFilter.hxx | 12 +- writerperfect/source/calc/MWAWCalcImportFilter.cxx | 3 - writerperfect/source/calc/MWAWCalcImportFilter.hxx | 9 +- writerperfect/source/calc/NumbersImportFilter.cxx | 3 - writerperfect/source/calc/NumbersImportFilter.hxx | 9 +- .../source/calc/StarOfficeCalcImportFilter.cxx | 3 - .../source/calc/StarOfficeCalcImportFilter.hxx | 9 +- writerperfect/source/draw/CDRImportFilter.cxx | 3 - writerperfect/source/draw/CDRImportFilter.hxx | 9 +- writerperfect/source/draw/CMXImportFilter.cxx | 3 - writerperfect/source/draw/CMXImportFilter.hxx | 9 +- writerperfect/source/draw/FreehandImportFilter.cxx | 3 - writerperfect/source/draw/FreehandImportFilter.hxx | 9 +- writerperfect/source/draw/MSPUBImportFilter.cxx | 3 - writerperfect/source/draw/MSPUBImportFilter.hxx | 9 +- writerperfect/source/draw/MWAWDrawImportFilter.cxx | 3 - writerperfect/source/draw/MWAWDrawImportFilter.hxx | 9 +- .../source/draw/PageMakerImportFilter.cxx | 3 - .../source/draw/PageMakerImportFilter.hxx | 9 +- .../source/draw/StarOfficeDrawImportFilter.cxx | 3 - .../source/draw/StarOfficeDrawImportFilter.hxx | 9 +- writerperfect/source/draw/VisioImportFilter.cxx | 3 - writerperfect/source/draw/VisioImportFilter.hxx | 9 +- writerperfect/source/draw/WPGImportFilter.cxx | 3 - writerperfect/source/draw/WPGImportFilter.hxx | 9 +- writerperfect/source/draw/ZMFImportFilter.cxx | 3 - writerperfect/source/draw/ZMFImportFilter.hxx | 9 +- .../source/impress/KeynoteImportFilter.cxx | 4 - .../source/impress/KeynoteImportFilter.hxx | 12 +- .../impress/MWAWPresentationImportFilter.cxx | 3 - .../impress/MWAWPresentationImportFilter.hxx | 9 +- .../source/writer/AbiWordImportFilter.cxx | 3 - .../source/writer/AbiWordImportFilter.hxx | 9 +- writerperfect/source/writer/EBookImportFilter.cxx | 3 - writerperfect/source/writer/EBookImportFilter.hxx | 9 +- .../source/writer/MSWorksImportFilter.cxx | 3 - .../source/writer/MSWorksImportFilter.hxx | 9 +- writerperfect/source/writer/MWAWImportFilter.cxx | 3 - writerperfect/source/writer/MWAWImportFilter.hxx | 9 +- writerperfect/source/writer/PagesImportFilter.cxx | 3 - writerperfect/source/writer/PagesImportFilter.hxx | 9 +- .../source/writer/StarOfficeWriterImportFilter.cxx | 3 - .../source/writer/StarOfficeWriterImportFilter.hxx | 9 +- .../source/writer/WordPerfectImportFilter.cxx | 9 - .../source/writer/WordPerfectImportFilter.hxx | 32 +- xmlhelp/source/cxxhelp/inc/tvfactory.hxx | 20 +- xmlhelp/source/cxxhelp/inc/tvread.hxx | 75 +- xmlhelp/source/cxxhelp/provider/content.cxx | 9 - xmlhelp/source/cxxhelp/provider/content.hxx | 26 +- xmlhelp/source/cxxhelp/provider/inputstream.cxx | 26 - xmlhelp/source/cxxhelp/provider/inputstream.hxx | 44 +- xmlhelp/source/cxxhelp/provider/provider.cxx | 10 - xmlhelp/source/cxxhelp/provider/provider.hxx | 44 +- xmlhelp/source/cxxhelp/provider/resultsetbase.cxx | 80 +- xmlhelp/source/cxxhelp/provider/resultsetbase.hxx | 217 ++--- xmlhelp/source/cxxhelp/provider/urlparameter.cxx | 70 +- xmlhelp/source/cxxhelp/provider/urlparameter.hxx | 5 +- xmlhelp/source/treeview/tvfactory.cxx | 8 - xmlhelp/source/treeview/tvread.cxx | 16 - xmloff/inc/MetaExportComponent.hxx | 2 +- xmloff/inc/SchXMLImport.hxx | 2 +- xmloff/inc/StyleMap.hxx | 2 +- xmloff/inc/XMLBasicExportFilter.hxx | 24 +- xmloff/inc/facreg.hxx | 168 ++-- xmloff/inc/xmlversion.hxx | 13 +- xmloff/source/chart/ColorPropertySet.cxx | 39 +- xmloff/source/chart/ColorPropertySet.hxx | 52 +- xmloff/source/chart/SchXMLExport.cxx | 14 +- xmloff/source/chart/SchXMLImport.cxx | 9 +- xmloff/source/core/PropertySetMerger.cxx | 56 +- xmloff/source/core/XMLBasicExportFilter.cxx | 8 - .../source/core/XMLEmbeddedObjectExportFilter.cxx | 17 - xmloff/source/core/attrlist.cxx | 15 +- xmloff/source/core/fasttokenhandler.cxx | 2 - xmloff/source/core/unoatrcn.cxx | 16 +- xmloff/source/core/xmlerror.cxx | 1 - xmloff/source/core/xmlexp.cxx | 17 +- xmloff/source/core/xmlictxt.cxx | 7 - xmloff/source/core/xmlimp.cxx | 47 +- xmloff/source/draw/animationimport.cxx | 10 +- xmloff/source/draw/sdxmlexp.cxx | 3 +- xmloff/source/draw/sdxmlexp_impl.hxx | 2 +- xmloff/source/draw/sdxmlimp.cxx | 4 +- xmloff/source/draw/sdxmlimp_impl.hxx | 4 +- xmloff/source/draw/ximppage.cxx | 16 +- xmloff/source/forms/attriblistmerge.cxx | 12 +- xmloff/source/forms/attriblistmerge.hxx | 12 +- xmloff/source/forms/elementexport.cxx | 2 +- xmloff/source/forms/elementexport.hxx | 2 +- xmloff/source/forms/eventexport.cxx | 12 +- xmloff/source/forms/eventexport.hxx | 12 +- xmloff/source/forms/gridcolumnproptranslator.cxx | 36 +- xmloff/source/forms/gridcolumnproptranslator.hxx | 24 +- xmloff/source/meta/MetaExportComponent.cxx | 3 +- xmloff/source/meta/MetaImportComponent.cxx | 4 +- xmloff/source/meta/xmlmetae.cxx | 8 - xmloff/source/meta/xmlversion.cxx | 5 - xmloff/source/style/StyleMap.cxx | 1 - xmloff/source/text/XMLAutoTextEventExport.cxx | 3 - xmloff/source/text/XMLAutoTextEventExport.hxx | 5 +- xmloff/source/text/XMLAutoTextEventImport.cxx | 3 +- xmloff/source/text/XMLAutoTextEventImport.hxx | 24 +- xmloff/source/transform/MutableAttrList.cxx | 8 - xmloff/source/transform/MutableAttrList.hxx | 16 +- xmloff/source/transform/OOo2Oasis.cxx | 15 +- xmloff/source/transform/OOo2Oasis.hxx | 26 +- xmloff/source/transform/Oasis2OOo.cxx | 6 +- xmloff/source/transform/Oasis2OOo.hxx | 8 +- xmloff/source/transform/TransformerBase.cxx | 16 +- xmloff/source/transform/TransformerBase.hxx | 39 +- xmloff/source/transform/XMLFilterRegistration.hxx | 58 +- xmlscript/source/xml_helper/xml_byteseq.cxx | 32 +- xmlscript/source/xml_helper/xml_element.cxx | 6 - xmlscript/source/xml_helper/xml_impctx.cxx | 92 +- xmlscript/source/xmldlg_imexp/imp_share.hxx | 220 ++--- xmlscript/source/xmldlg_imexp/xmldlg_addfunc.cxx | 4 +- xmlscript/source/xmldlg_imexp/xmldlg_impmodels.cxx | 58 -- xmlscript/source/xmldlg_imexp/xmldlg_import.cxx | 15 - xmlscript/source/xmlflat_imexp/xmlbas_export.cxx | 15 +- xmlscript/source/xmlflat_imexp/xmlbas_export.hxx | 27 +- xmlscript/source/xmlflat_imexp/xmlbas_import.cxx | 41 +- xmlscript/source/xmlflat_imexp/xmlbas_import.hxx | 108 +-- xmlscript/source/xmllib_imexp/imp_share.hxx | 54 +- xmlscript/source/xmllib_imexp/xmllib_import.cxx | 18 - xmlscript/source/xmlmod_imexp/imp_share.hxx | 42 +- xmlscript/source/xmlmod_imexp/xmlmod_import.cxx | 14 - xmlsecurity/inc/certificate.hxx | 2 +- xmlsecurity/inc/framework/saxeventkeeperimpl.hxx | 93 +-- xmlsecurity/inc/framework/securityengine.hxx | 13 +- xmlsecurity/inc/framework/signaturecreatorimpl.hxx | 36 +- xmlsecurity/inc/framework/signatureengine.hxx | 16 +- .../inc/framework/signatureverifierimpl.hxx | 33 +- xmlsecurity/inc/xmlsec/saxhelper.hxx | 21 +- .../inc/xmlsec/xmldocumentwrapper_xmlsecimpl.hxx | 108 +-- xmlsecurity/inc/xsecctl.hxx | 15 +- .../source/component/certificatecontainer.cxx | 11 +- .../source/component/certificatecontainer.hxx | 20 +- .../source/component/documentdigitalsignatures.cxx | 50 +- .../source/component/documentdigitalsignatures.hxx | 64 +- xmlsecurity/source/framework/decryptorimpl.cxx | 11 - xmlsecurity/source/framework/decryptorimpl.hxx | 33 +- xmlsecurity/source/framework/encryptionengine.cxx | 2 - xmlsecurity/source/framework/encryptionengine.hxx | 7 +- xmlsecurity/source/framework/encryptorimpl.cxx | 13 - xmlsecurity/source/framework/encryptorimpl.hxx | 39 +- .../source/framework/saxeventkeeperimpl.cxx | 31 - xmlsecurity/source/framework/securityengine.cxx | 3 - .../source/framework/signaturecreatorimpl.cxx | 12 - xmlsecurity/source/framework/signatureengine.cxx | 5 - .../source/framework/signatureverifierimpl.cxx | 11 - .../source/framework/xmlencryptiontemplateimpl.cxx | 18 +- .../source/framework/xmlencryptiontemplateimpl.hxx | 25 +- .../source/framework/xmlsignaturetemplateimpl.cxx | 18 +- .../source/framework/xmlsignaturetemplateimpl.hxx | 30 +- xmlsecurity/source/helper/ooxmlsecparser.cxx | 17 +- xmlsecurity/source/helper/ooxmlsecparser.hxx | 20 +- xmlsecurity/source/helper/xmlsignaturehelper2.cxx | 12 - xmlsecurity/source/helper/xmlsignaturehelper2.hxx | 36 +- xmlsecurity/source/helper/xsecctl.cxx | 5 - xmlsecurity/source/helper/xsecparser.cxx | 9 - xmlsecurity/source/helper/xsecparser.hxx | 27 +- .../xmlsec/certificateextension_xmlsecimpl.hxx | 6 +- .../xmlsec/mscrypt/sanextension_mscryptimpl.cxx | 8 +- .../xmlsec/mscrypt/sanextension_mscryptimpl.hxx | 8 +- .../mscrypt/securityenvironment_mscryptimpl.cxx | 52 +- .../mscrypt/securityenvironment_mscryptimpl.hxx | 68 +- .../xmlsec/mscrypt/seinitializer_mscryptimpl.cxx | 8 - .../xmlsec/mscrypt/seinitializer_mscryptimpl.hxx | 29 +- .../xmlsec/mscrypt/x509certificate_mscryptimpl.cxx | 34 +- .../xmlsec/mscrypt/x509certificate_mscryptimpl.hxx | 45 +- .../xmlsec/mscrypt/xmlencryption_mscryptimpl.cxx | 16 +- .../xmlsec/mscrypt/xmlencryption_mscryptimpl.hxx | 17 +- .../mscrypt/xmlsecuritycontext_mscryptimpl.cxx | 16 +- .../mscrypt/xmlsecuritycontext_mscryptimpl.hxx | 28 +- .../xmlsec/mscrypt/xmlsignature_mscryptimpl.cxx | 17 +- .../xmlsec/mscrypt/xmlsignature_mscryptimpl.hxx | 18 +- xmlsecurity/source/xmlsec/nss/ciphercontext.cxx | 2 - xmlsecurity/source/xmlsec/nss/ciphercontext.hxx | 4 +- xmlsecurity/source/xmlsec/nss/digestcontext.cxx | 2 - xmlsecurity/source/xmlsec/nss/digestcontext.hxx | 4 +- xmlsecurity/source/xmlsec/nss/nssinitializer.cxx | 8 - xmlsecurity/source/xmlsec/nss/nssinitializer.hxx | 22 +- .../source/xmlsec/nss/sanextension_nssimpl.cxx | 2 +- .../source/xmlsec/nss/sanextension_nssimpl.hxx | 8 +- .../xmlsec/nss/securityenvironment_nssimpl.cxx | 42 +- .../xmlsec/nss/securityenvironment_nssimpl.hxx | 46 +- .../source/xmlsec/nss/seinitializer_nssimpl.cxx | 8 - .../source/xmlsec/nss/seinitializer_nssimpl.hxx | 24 +- .../source/xmlsec/nss/x509certificate_nssimpl.cxx | 34 +- .../source/xmlsec/nss/x509certificate_nssimpl.hxx | 45 +- .../source/xmlsec/nss/xmlencryption_nssimpl.cxx | 18 +- .../source/xmlsec/nss/xmlencryption_nssimpl.hxx | 18 +- .../xmlsec/nss/xmlsecuritycontext_nssimpl.cxx | 16 +- .../xmlsec/nss/xmlsecuritycontext_nssimpl.hxx | 27 +- .../source/xmlsec/nss/xmlsignature_nssimpl.cxx | 18 +- .../source/xmlsec/nss/xmlsignature_nssimpl.hxx | 18 +- xmlsecurity/source/xmlsec/saxhelper.cxx | 7 - xmlsecurity/source/xmlsec/serialnumberadapter.cxx | 17 +- xmlsecurity/source/xmlsec/serialnumberadapter.hxx | 5 +- .../xmlsec/xmldocumentwrapper_xmlsecimpl.cxx | 36 - .../source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx | 8 - .../source/xmlsec/xmlelementwrapper_xmlsecimpl.hxx | 24 +- 4704 files changed, 58198 insertions(+), 95279 deletions(-) diff --git a/UnoControls/inc/basecontainercontrol.hxx b/UnoControls/inc/basecontainercontrol.hxx index 908b8a2873b5..55a8f940d7c4 100644 --- a/UnoControls/inc/basecontainercontrol.hxx +++ b/UnoControls/inc/basecontainercontrol.hxx @@ -74,7 +74,7 @@ public: virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; // XTypeProvider @@ -86,62 +86,59 @@ public: @onerror A RuntimeException is thrown. */ - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XAggregation virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; // XControl virtual void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& xToolkit , const css::uno::Reference< css::awt::XWindowPeer >& xParent - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& xModel - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; - virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel() override; // XComponent - virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispose() override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& rEvent ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& rEvent ) override; // XControlContainer virtual void SAL_CALL addControl( const OUString& sName , const css::uno::Reference< css::awt::XControl >& xControl - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL removeControl( const css::uno::Reference< css::awt::XControl >& xControl - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL setStatusText( const OUString& sStatusText - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual css::uno::Reference< css::awt::XControl > SAL_CALL getControl( const OUString& sName - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; - virtual css::uno::Sequence< css::uno::Reference< css::awt::XControl > > SAL_CALL getControls() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Reference< css::awt::XControl > > SAL_CALL getControls() override; // XWindow - virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setVisible( sal_Bool bVisible ) override; protected: using OComponentHelper::disposing; diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx index 8e8b93784b7f..6967a3ff1085 100644 --- a/UnoControls/inc/basecontrol.hxx +++ b/UnoControls/inc/basecontrol.hxx @@ -139,7 +139,7 @@ public: virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; /**_______________________________________________________________________________________________________ @short increment refcount @@ -169,8 +169,7 @@ public: @onerror A RuntimeException is thrown. */ - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; /**_______________________________________________________________________________________________________ @short get implementation id @@ -183,75 +182,68 @@ public: @onerror A RuntimeException is thrown. */ - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; // XAggregation virtual void SAL_CALL setDelegator( const css::uno::Reference< css::uno::XInterface >& xDelegator - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; // XServiceInfo virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XComponent - virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispose() override; virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; // XControl virtual void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& xToolkit, const css::uno::Reference< css::awt::XWindowPeer >& xParent - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL setContext( const css::uno::Reference< css::uno::XInterface >& xContext - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& xModel - ) throw( css::uno::RuntimeException, std::exception ) override = 0; + ) override = 0; - virtual void SAL_CALL setDesignMode( sal_Bool bOn ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setDesignMode( sal_Bool bOn ) override; - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getContext() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getContext() override; - virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel() - throw( css::uno::RuntimeException, std::exception ) override = 0; + virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel() override = 0; - virtual css::uno::Reference< css::awt::XWindowPeer > SAL_CALL getPeer() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::awt::XWindowPeer > SAL_CALL getPeer() override; - virtual css::uno::Reference< css::awt::XView > SAL_CALL getView() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::awt::XView > SAL_CALL getView() override; - virtual sal_Bool SAL_CALL isDesignMode() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL isDesignMode() override; - virtual sal_Bool SAL_CALL isTransparent() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL isTransparent() override; // XWindow @@ -259,99 +251,97 @@ public: sal_Int32 nY , sal_Int32 nWidth , sal_Int32 nHeight , - sal_Int16 nFlags ) throw( css::uno::RuntimeException, std::exception ) override; + sal_Int16 nFlags ) override; - virtual void SAL_CALL setVisible( sal_Bool bVisible ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setVisible( sal_Bool bVisible ) override; - virtual void SAL_CALL setEnable( sal_Bool bEnable ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setEnable( sal_Bool bEnable ) override; - virtual void SAL_CALL setFocus() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setFocus() override; - virtual css::awt::Rectangle SAL_CALL getPosSize() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::awt::Rectangle SAL_CALL getPosSize() override; virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL addKeyListener( - const css::uno::Reference< css::awt::XKeyListener >& xListener ) - throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::awt::XKeyListener >& xListener ) override; virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; // XView virtual void SAL_CALL draw( sal_Int32 nX , - sal_Int32 nY ) throw( css::uno::RuntimeException, std::exception ) override; + sal_Int32 nY ) override; virtual sal_Bool SAL_CALL setGraphics( const css::uno::Reference< css::awt::XGraphics >& xDevice - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL setZoom( float fZoomX , - float fZoomY ) throw( css::uno::RuntimeException, std::exception ) override; + float fZoomY ) override; - virtual css::uno::Reference< css::awt::XGraphics > SAL_CALL getGraphics() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::awt::XGraphics > SAL_CALL getGraphics() override; - virtual css::awt::Size SAL_CALL getSize() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::awt::Size SAL_CALL getSize() override; // css::lang::XEventListener virtual void SAL_CALL disposing( const css::lang::EventObject& rSource - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; // XPaintListener virtual void SAL_CALL windowPaint( const css::awt::PaintEvent& rEvent - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; // XWindowListener - virtual void SAL_CALL windowResized( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& aEvent ) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL windowShown( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL windowHidden( const css::lang::EventObject& aEvent ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL windowResized( const css::awt::WindowEvent& aEvent ) override; + virtual void SAL_CALL windowMoved( const css::awt::WindowEvent& aEvent ) override; + virtual void SAL_CALL windowShown( const css::lang::EventObject& aEvent ) override; + virtual void SAL_CALL windowHidden( const css::lang::EventObject& aEvent ) override; protected: using OComponentHelper::disposing; diff --git a/UnoControls/inc/multiplexer.hxx b/UnoControls/inc/multiplexer.hxx index f238293444f1..6229b5a5b17e 100644 --- a/UnoControls/inc/multiplexer.hxx +++ b/UnoControls/inc/multiplexer.hxx @@ -100,8 +100,7 @@ public: @onerror A RuntimeException is thrown. */ - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; /**_______________________________________________________________________________________________________ @short increment refcount @@ -154,88 +153,65 @@ public: // XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& aSource) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& aSource) override; // XFocusListener - virtual void SAL_CALL focusGained(const css::awt::FocusEvent& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL focusGained(const css::awt::FocusEvent& aEvent ) override; - virtual void SAL_CALL focusLost(const css::awt::FocusEvent& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL focusLost(const css::awt::FocusEvent& aEvent ) override; // XWindowListener - virtual void SAL_CALL windowResized(const css::awt::WindowEvent& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL windowResized(const css::awt::WindowEvent& aEvent ) override; - virtual void SAL_CALL windowMoved(const css::awt::WindowEvent& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL windowMoved(const css::awt::WindowEvent& aEvent ) override; - virtual void SAL_CALL windowShown(const css::lang::EventObject& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL windowShown(const css::lang::EventObject& aEvent ) override; - virtual void SAL_CALL windowHidden(const css::lang::EventObject& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL windowHidden(const css::lang::EventObject& aEvent ) override; // XKeyListener - virtual void SAL_CALL keyPressed( const css::awt::KeyEvent& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL keyPressed( const css::awt::KeyEvent& aEvent ) override; - virtual void SAL_CALL keyReleased( const css::awt::KeyEvent& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL keyReleased( const css::awt::KeyEvent& aEvent ) override; // XMouseListener - virtual void SAL_CALL mousePressed(const css::awt::MouseEvent& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL mousePressed(const css::awt::MouseEvent& aEvent ) override; - virtual void SAL_CALL mouseReleased(const css::awt::MouseEvent& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL mouseReleased(const css::awt::MouseEvent& aEvent ) override; - virtual void SAL_CALL mouseEntered(const css::awt::MouseEvent& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL mouseEntered(const css::awt::MouseEvent& aEvent ) override; - virtual void SAL_CALL mouseExited(const css::awt::MouseEvent& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL mouseExited(const css::awt::MouseEvent& aEvent ) override; // XMouseMotionListener - virtual void SAL_CALL mouseDragged(const css::awt::MouseEvent& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL mouseDragged(const css::awt::MouseEvent& aEvent ) override; - virtual void SAL_CALL mouseMoved(const css::awt::MouseEvent& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL mouseMoved(const css::awt::MouseEvent& aEvent ) override; // XPaintListener - virtual void SAL_CALL windowPaint(const css::awt::PaintEvent& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL windowPaint(const css::awt::PaintEvent& aEvent ) override; // XTopWindowListener - virtual void SAL_CALL windowOpened( const css::lang::EventObject& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL windowOpened( const css::lang::EventObject& aEvent ) override; - virtual void SAL_CALL windowClosing( const css::lang::EventObject& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL windowClosing( const css::lang::EventObject& aEvent ) override; - virtual void SAL_CALL windowClosed( const css::lang::EventObject& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL windowClosed( const css::lang::EventObject& aEvent ) override; - virtual void SAL_CALL windowMinimized( const css::lang::EventObject& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL windowMinimized( const css::lang::EventObject& aEvent ) override; - virtual void SAL_CALL windowNormalized( const css::lang::EventObject& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL windowNormalized( const css::lang::EventObject& aEvent ) override; - virtual void SAL_CALL windowActivated( const css::lang::EventObject& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL windowActivated( const css::lang::EventObject& aEvent ) override; - virtual void SAL_CALL windowDeactivated( const css::lang::EventObject& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL windowDeactivated( const css::lang::EventObject& aEvent ) override; // protected methods diff --git a/UnoControls/source/base/basecontainercontrol.cxx b/UnoControls/source/base/basecontainercontrol.cxx index cb00544b67d6..a6fb9b97447a 100644 --- a/UnoControls/source/base/basecontainercontrol.cxx +++ b/UnoControls/source/base/basecontainercontrol.cxx @@ -48,7 +48,7 @@ BaseContainerControl::~BaseContainerControl() // XInterface -Any SAL_CALL BaseContainerControl::queryInterface( const Type& rType ) throw( RuntimeException, std::exception ) +Any SAL_CALL BaseContainerControl::queryInterface( const Type& rType ) { // Attention: // Don't use mutex or guard in this method!!! Is a method of XInterface. @@ -71,7 +71,7 @@ Any SAL_CALL BaseContainerControl::queryInterface( const Type& rType ) throw( Ru // XTypeProvider -Sequence< Type > SAL_CALL BaseContainerControl::getTypes() throw( RuntimeException, std::exception ) +Sequence< Type > SAL_CALL BaseContainerControl::getTypes() { // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! @@ -101,7 +101,7 @@ Sequence< Type > SAL_CALL BaseContainerControl::getTypes() throw( RuntimeExcepti // XAggregation -Any SAL_CALL BaseContainerControl::queryAggregation( const Type& aType ) throw( RuntimeException, std::exception ) +Any SAL_CALL BaseContainerControl::queryAggregation( const Type& aType ) { // Ask for my own supported interfaces ... // Attention: XTypeProvider and XInterface are supported by OComponentHelper! @@ -127,7 +127,7 @@ Any SAL_CALL BaseContainerControl::queryAggregation( const Type& aType ) throw( // XControl void SAL_CALL BaseContainerControl::createPeer( const Reference< XToolkit >& xToolkit , - const Reference< XWindowPeer >& xParent ) throw( RuntimeException, std::exception ) + const Reference< XWindowPeer >& xParent ) { if ( !getPeer().is() ) { @@ -151,7 +151,7 @@ void SAL_CALL BaseContainerControl::createPeer( const Reference< XToolkit >& // XControl -sal_Bool SAL_CALL BaseContainerControl::setModel( const Reference< XControlModel >& ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL BaseContainerControl::setModel( const Reference< XControlModel >& ) { // This object has NO model. return false; @@ -159,7 +159,7 @@ sal_Bool SAL_CALL BaseContainerControl::setModel( const Reference< XControlModel // XControl -Reference< XControlModel > SAL_CALL BaseContainerControl::getModel() throw( RuntimeException, std::exception ) +Reference< XControlModel > SAL_CALL BaseContainerControl::getModel() { // This object has NO model. // return (XControlModel*)this; @@ -168,7 +168,7 @@ Reference< XControlModel > SAL_CALL BaseContainerControl::getModel() throw( Runt // XComponent -void SAL_CALL BaseContainerControl::dispose() throw( RuntimeException, std::exception ) +void SAL_CALL BaseContainerControl::dispose() { // Tell everything that this container is now gone. // It's faster if you listen to both the control and the container. @@ -207,7 +207,7 @@ void SAL_CALL BaseContainerControl::dispose() throw( RuntimeException, std::exce // XEventListener -void SAL_CALL BaseContainerControl::disposing( const EventObject& rEvent ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseContainerControl::disposing( const EventObject& rEvent ) { Reference< XControl > xControl( rEvent.Source, UNO_QUERY ); @@ -217,7 +217,7 @@ void SAL_CALL BaseContainerControl::disposing( const EventObject& rEvent ) throw // XControlContainer -void SAL_CALL BaseContainerControl::addControl ( const OUString& rName, const Reference< XControl > & rControl ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseContainerControl::addControl ( const OUString& rName, const Reference< XControl > & rControl ) { if ( !rControl.is () ) return; @@ -271,7 +271,7 @@ void SAL_CALL BaseContainerControl::addControl ( const OUString& rName, const Re // XControlContainer -void SAL_CALL BaseContainerControl::removeControl ( const Reference< XControl > & rControl ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseContainerControl::removeControl ( const Reference< XControl > & rControl ) { if ( rControl.is() ) { @@ -322,7 +322,7 @@ void SAL_CALL BaseContainerControl::removeControl ( const Reference< XControl > // XControlContainer -void SAL_CALL BaseContainerControl::setStatusText ( const OUString& rStatusText ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseContainerControl::setStatusText ( const OUString& rStatusText ) { // go down to each parent Reference< XControlContainer > xContainer ( getContext(), UNO_QUERY ); @@ -335,7 +335,7 @@ void SAL_CALL BaseContainerControl::setStatusText ( const OUString& rStatusText // XControlContainer -Reference< XControl > SAL_CALL BaseContainerControl::getControl ( const OUString& rName ) throw( RuntimeException, std::exception ) +Reference< XControl > SAL_CALL BaseContainerControl::getControl ( const OUString& rName ) { // Ready for multithreading MutexGuard aGuard ( Mutex::getGlobalMutex() ); @@ -361,7 +361,7 @@ Reference< XControl > SAL_CALL BaseContainerControl::getControl ( const OUString // XControlContainer -Sequence< Reference< XControl > > SAL_CALL BaseContainerControl::getControls () throw( RuntimeException, std::exception ) +Sequence< Reference< XControl > > SAL_CALL BaseContainerControl::getControls () { // Ready for multithreading MutexGuard aGuard ( Mutex::getGlobalMutex() ); @@ -384,7 +384,7 @@ Sequence< Reference< XControl > > SAL_CALL BaseContainerControl::getControls () // XWindow -void SAL_CALL BaseContainerControl::setVisible ( sal_Bool bVisible ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseContainerControl::setVisible ( sal_Bool bVisible ) { // override baseclass definition BaseControl::setVisible ( bVisible ); diff --git a/UnoControls/source/base/basecontrol.cxx b/UnoControls/source/base/basecontrol.cxx index 98d927aa2b1f..81a79a4da107 100644 --- a/UnoControls/source/base/basecontrol.cxx +++ b/UnoControls/source/base/basecontrol.cxx @@ -70,7 +70,7 @@ BaseControl::~BaseControl() // XInterface -Any SAL_CALL BaseControl::queryInterface( const Type& rType ) throw( RuntimeException, std::exception ) +Any SAL_CALL BaseControl::queryInterface( const Type& rType ) { Any aReturn; if ( m_xDelegator.is() ) @@ -112,7 +112,7 @@ void SAL_CALL BaseControl::release() throw() // XTypeProvider -Sequence< Type > SAL_CALL BaseControl::getTypes() throw( RuntimeException, std::exception ) +Sequence< Type > SAL_CALL BaseControl::getTypes() { // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! @@ -147,14 +147,14 @@ Sequence< Type > SAL_CALL BaseControl::getTypes() throw( RuntimeException, std:: // XTypeProvider -Sequence< sal_Int8 > SAL_CALL BaseControl::getImplementationId() throw( RuntimeException, std::exception ) +Sequence< sal_Int8 > SAL_CALL BaseControl::getImplementationId() { return css::uno::Sequence(); } // XAggregation -void SAL_CALL BaseControl::setDelegator( const Reference< XInterface >& xDel ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::setDelegator( const Reference< XInterface >& xDel ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -163,7 +163,7 @@ void SAL_CALL BaseControl::setDelegator( const Reference< XInterface >& xDel ) t // XAggregation -Any SAL_CALL BaseControl::queryAggregation( const Type& aType ) throw( RuntimeException, std::exception ) +Any SAL_CALL BaseControl::queryAggregation( const Type& aType ) { // Ask for my own supported interfaces ... // Attention: XTypeProvider and XInterface are supported by OComponentHelper! @@ -192,28 +192,28 @@ Any SAL_CALL BaseControl::queryAggregation( const Type& aType ) throw( RuntimeEx // XServiceInfo -OUString SAL_CALL BaseControl::getImplementationName() throw( RuntimeException, std::exception ) +OUString SAL_CALL BaseControl::getImplementationName() { return OUString(); } // XServiceInfo -sal_Bool SAL_CALL BaseControl::supportsService( const OUString& sServiceName ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL BaseControl::supportsService( const OUString& sServiceName ) { return cppu::supportsService(this, sServiceName); } // XServiceInfo -Sequence< OUString > SAL_CALL BaseControl::getSupportedServiceNames() throw( RuntimeException, std::exception ) +Sequence< OUString > SAL_CALL BaseControl::getSupportedServiceNames() { return Sequence< OUString >(); } // XComponent -void SAL_CALL BaseControl::dispose() throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::dispose() { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -258,7 +258,7 @@ void SAL_CALL BaseControl::dispose() throw( RuntimeException, std::exception ) // XComponent -void SAL_CALL BaseControl::addEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::addEventListener( const Reference< XEventListener >& xListener ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -267,7 +267,7 @@ void SAL_CALL BaseControl::addEventListener( const Reference< XEventListener >& // XComponent -void SAL_CALL BaseControl::removeEventListener( const Reference< XEventListener >& xListener ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::removeEventListener( const Reference< XEventListener >& xListener ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -277,7 +277,7 @@ void SAL_CALL BaseControl::removeEventListener( const Reference< XEventListener // XControl void SAL_CALL BaseControl::createPeer( const Reference< XToolkit >& xToolkit , - const Reference< XWindowPeer >& xParentPeer ) throw( RuntimeException, std::exception ) + const Reference< XWindowPeer >& xParentPeer ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -337,7 +337,7 @@ void SAL_CALL BaseControl::createPeer( const Reference< XToolkit >& xToo // XControl -void SAL_CALL BaseControl::setContext( const Reference< XInterface >& xContext ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::setContext( const Reference< XInterface >& xContext ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -346,7 +346,7 @@ void SAL_CALL BaseControl::setContext( const Reference< XInterface >& xContext ) // XControl -void SAL_CALL BaseControl::setDesignMode( sal_Bool bOn ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::setDesignMode( sal_Bool bOn ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -355,7 +355,7 @@ void SAL_CALL BaseControl::setDesignMode( sal_Bool bOn ) throw( RuntimeException // XControl -Reference< XInterface > SAL_CALL BaseControl::getContext() throw( RuntimeException, std::exception ) +Reference< XInterface > SAL_CALL BaseControl::getContext() { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -364,7 +364,7 @@ Reference< XInterface > SAL_CALL BaseControl::getContext() throw( RuntimeExcepti // XControl -Reference< XWindowPeer > SAL_CALL BaseControl::getPeer() throw( RuntimeException, std::exception ) +Reference< XWindowPeer > SAL_CALL BaseControl::getPeer() { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -373,7 +373,7 @@ Reference< XWindowPeer > SAL_CALL BaseControl::getPeer() throw( RuntimeException // XControl -Reference< XView > SAL_CALL BaseControl::getView() throw( RuntimeException, std::exception ) +Reference< XView > SAL_CALL BaseControl::getView() { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -382,7 +382,7 @@ Reference< XView > SAL_CALL BaseControl::getView() throw( RuntimeException, std: // XControl -sal_Bool SAL_CALL BaseControl::isDesignMode() throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL BaseControl::isDesignMode() { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -391,7 +391,7 @@ sal_Bool SAL_CALL BaseControl::isDesignMode() throw( RuntimeException, std::exce // XControl -sal_Bool SAL_CALL BaseControl::isTransparent() throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL BaseControl::isTransparent() { return false; } @@ -402,7 +402,7 @@ void SAL_CALL BaseControl::setPosSize( sal_Int32 nX , sal_Int32 nY , sal_Int32 nWidth , sal_Int32 nHeight , - sal_Int16 nFlags ) throw( RuntimeException, std::exception ) + sal_Int16 nFlags ) { // - change size and position of window and save the values @@ -443,7 +443,7 @@ void SAL_CALL BaseControl::setPosSize( sal_Int32 nX , // XWindow -void SAL_CALL BaseControl::setVisible( sal_Bool bVisible ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::setVisible( sal_Bool bVisible ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -460,7 +460,7 @@ void SAL_CALL BaseControl::setVisible( sal_Bool bVisible ) throw( RuntimeExcepti // XWindow -void SAL_CALL BaseControl::setEnable( sal_Bool bEnable ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::setEnable( sal_Bool bEnable ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -477,7 +477,7 @@ void SAL_CALL BaseControl::setEnable( sal_Bool bEnable ) throw( RuntimeException // XWindow -void SAL_CALL BaseControl::setFocus() throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::setFocus() { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -490,7 +490,7 @@ void SAL_CALL BaseControl::setFocus() throw( RuntimeException, std::exception ) // XWindow -Rectangle SAL_CALL BaseControl::getPosSize() throw( RuntimeException, std::exception ) +Rectangle SAL_CALL BaseControl::getPosSize() { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -499,84 +499,84 @@ Rectangle SAL_CALL BaseControl::getPosSize() throw( RuntimeException, std::excep // XWindow -void SAL_CALL BaseControl::addWindowListener( const Reference< XWindowListener >& xListener ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::addWindowListener( const Reference< XWindowListener >& xListener ) { impl_getMultiplexer()->advise( cppu::UnoType::get(), xListener ); } // XWindow -void SAL_CALL BaseControl::addFocusListener( const Reference< XFocusListener >& xListener ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::addFocusListener( const Reference< XFocusListener >& xListener ) { impl_getMultiplexer()->advise( cppu::UnoType::get(), xListener ); } // XWindow -void SAL_CALL BaseControl::addKeyListener( const Reference< XKeyListener >& xListener ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::addKeyListener( const Reference< XKeyListener >& xListener ) { impl_getMultiplexer()->advise( cppu::UnoType::get(), xListener ); } // XWindow -void SAL_CALL BaseControl::addMouseListener( const Reference< XMouseListener >& xListener ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::addMouseListener( const Reference< XMouseListener >& xListener ) { impl_getMultiplexer()->advise( cppu::UnoType::get(), xListener ); } // XWindow -void SAL_CALL BaseControl::addMouseMotionListener( const Reference< XMouseMotionListener >& xListener ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::addMouseMotionListener( const Reference< XMouseMotionListener >& xListener ) { impl_getMultiplexer()->advise( cppu::UnoType::get(), xListener ); } // XWindow -void SAL_CALL BaseControl::addPaintListener( const Reference< XPaintListener >& xListener ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::addPaintListener( const Reference< XPaintListener >& xListener ) { impl_getMultiplexer()->advise( cppu::UnoType::get(), xListener ); } // XWindow -void SAL_CALL BaseControl::removeWindowListener( const Reference< XWindowListener >& xListener ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::removeWindowListener( const Reference< XWindowListener >& xListener ) { impl_getMultiplexer()->unadvise( cppu::UnoType::get(), xListener ); } // XWindow -void SAL_CALL BaseControl::removeFocusListener( const Reference< XFocusListener >& xListener ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::removeFocusListener( const Reference< XFocusListener >& xListener ) { impl_getMultiplexer()->unadvise( cppu::UnoType::get(), xListener ); } // XWindow -void SAL_CALL BaseControl::removeKeyListener( const Reference< XKeyListener >& xListener ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::removeKeyListener( const Reference< XKeyListener >& xListener ) { impl_getMultiplexer()->unadvise( cppu::UnoType::get(), xListener ); } // XWindow -void SAL_CALL BaseControl::removeMouseListener( const Reference< XMouseListener >& xListener ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::removeMouseListener( const Reference< XMouseListener >& xListener ) { impl_getMultiplexer()->unadvise( cppu::UnoType::get(), xListener ); } // XWindow -void SAL_CALL BaseControl::removeMouseMotionListener( const Reference< XMouseMotionListener >& xListener ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::removeMouseMotionListener( const Reference< XMouseMotionListener >& xListener ) { impl_getMultiplexer()->unadvise( cppu::UnoType::get(), xListener ); } // XWindow -void SAL_CALL BaseControl::removePaintListener( const Reference< XPaintListener >& xListener ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::removePaintListener( const Reference< XPaintListener >& xListener ) { impl_getMultiplexer()->unadvise( cppu::UnoType::get(), xListener ); } @@ -584,7 +584,7 @@ void SAL_CALL BaseControl::removePaintListener( const Reference< XPaintListener // XView void SAL_CALL BaseControl::draw( sal_Int32 nX , - sal_Int32 nY ) throw( RuntimeException, std::exception ) + sal_Int32 nY ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -597,7 +597,7 @@ void SAL_CALL BaseControl::draw( sal_Int32 nX , // XView -sal_Bool SAL_CALL BaseControl::setGraphics( const Reference< XGraphics >& xDevice ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL BaseControl::setGraphics( const Reference< XGraphics >& xDevice ) { // - set the graphics for an view // - in this class exist 2 graphics-member ... one for peer[_xGraphicsPeer] and one for view[_xGraphicsView] @@ -618,14 +618,14 @@ sal_Bool SAL_CALL BaseControl::setGraphics( const Reference< XGraphics >& xDevic // XView void SAL_CALL BaseControl::setZoom( float /*fZoomX*/ , - float /*fZoomY*/ ) throw( RuntimeException, std::exception ) + float /*fZoomY*/ ) { // Not implemented yet } // XView -Reference< XGraphics > SAL_CALL BaseControl::getGraphics() throw( RuntimeException, std::exception ) +Reference< XGraphics > SAL_CALL BaseControl::getGraphics() { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -634,7 +634,7 @@ Reference< XGraphics > SAL_CALL BaseControl::getGraphics() throw( RuntimeExcepti // XView -Size SAL_CALL BaseControl::getSize() throw( RuntimeException, std::exception ) +Size SAL_CALL BaseControl::getSize() { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -643,7 +643,7 @@ Size SAL_CALL BaseControl::getSize() throw( RuntimeException, std::exception ) // XEventListener -void SAL_CALL BaseControl::disposing( const EventObject& /*aSource*/ ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::disposing( const EventObject& /*aSource*/ ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -665,7 +665,7 @@ void SAL_CALL BaseControl::disposing( const EventObject& /*aSource*/ ) throw( Ru // XPaintListener -void SAL_CALL BaseControl::windowPaint( const PaintEvent& /*aEvent*/ ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::windowPaint( const PaintEvent& /*aEvent*/ ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -678,7 +678,7 @@ void SAL_CALL BaseControl::windowPaint( const PaintEvent& /*aEvent*/ ) throw( Ru // XWindowListener -void SAL_CALL BaseControl::windowResized( const WindowEvent& aEvent ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::windowResized( const WindowEvent& aEvent ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -693,7 +693,7 @@ void SAL_CALL BaseControl::windowResized( const WindowEvent& aEvent ) throw( Run // XWindowListener -void SAL_CALL BaseControl::windowMoved( const WindowEvent& aEvent ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::windowMoved( const WindowEvent& aEvent ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -708,13 +708,13 @@ void SAL_CALL BaseControl::windowMoved( const WindowEvent& aEvent ) throw( Runti // XWindowListener -void SAL_CALL BaseControl::windowShown( const EventObject& /*aEvent*/ ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::windowShown( const EventObject& /*aEvent*/ ) { } // XWindowListener -void SAL_CALL BaseControl::windowHidden( const EventObject& /*aEvent*/ ) throw( RuntimeException, std::exception ) +void SAL_CALL BaseControl::windowHidden( const EventObject& /*aEvent*/ ) { } diff --git a/UnoControls/source/base/multiplexer.cxx b/UnoControls/source/base/multiplexer.cxx index fbf13bff4957..d19e930ea2b0 100644 --- a/UnoControls/source/base/multiplexer.cxx +++ b/UnoControls/source/base/multiplexer.cxx @@ -91,7 +91,7 @@ OMRCListenerMultiplexerHelper::~OMRCListenerMultiplexerHelper() // XInterface -Any SAL_CALL OMRCListenerMultiplexerHelper::queryInterface( const Type& rType ) throw( RuntimeException, std::exception ) +Any SAL_CALL OMRCListenerMultiplexerHelper::queryInterface( const Type& rType ) { // Attention: // Don't use mutex or guard in this method!!! Is a method of XInterface. @@ -219,7 +219,7 @@ void OMRCListenerMultiplexerHelper::unadvise( const Type& // XEventListener -void SAL_CALL OMRCListenerMultiplexerHelper::disposing( const EventObject& /*aSource*/ ) throw( RuntimeException, std::exception ) +void SAL_CALL OMRCListenerMultiplexerHelper::disposing( const EventObject& /*aSource*/ ) { MutexGuard aGuard( m_aMutex ); // peer is disposed, clear the reference @@ -228,154 +228,154 @@ void SAL_CALL OMRCListenerMultiplexerHelper::disposing( const EventObject& /*aSo // XFcousListener -void OMRCListenerMultiplexerHelper::focusGained(const FocusEvent& aEvent ) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::focusGained(const FocusEvent& aEvent ) { MULTIPLEX( XFocusListener, focusGained, FocusEvent, aEvent ) } // XFcousListener -void OMRCListenerMultiplexerHelper::focusLost(const FocusEvent& aEvent ) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::focusLost(const FocusEvent& aEvent ) { MULTIPLEX( XFocusListener, focusLost, FocusEvent, aEvent ) } // XWindowListener -void OMRCListenerMultiplexerHelper::windowResized(const WindowEvent& aEvent ) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::windowResized(const WindowEvent& aEvent ) { MULTIPLEX( XWindowListener, windowResized, WindowEvent, aEvent ) } // XWindowListener -void OMRCListenerMultiplexerHelper::windowMoved(const WindowEvent& aEvent ) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::windowMoved(const WindowEvent& aEvent ) { MULTIPLEX( XWindowListener, windowMoved, WindowEvent, aEvent ) } // XWindowListener -void OMRCListenerMultiplexerHelper::windowShown(const EventObject& aEvent ) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::windowShown(const EventObject& aEvent ) { MULTIPLEX( XWindowListener, windowShown, EventObject, aEvent ) } // XWindowListener -void OMRCListenerMultiplexerHelper::windowHidden(const EventObject& aEvent ) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::windowHidden(const EventObject& aEvent ) { MULTIPLEX( XWindowListener, windowHidden, EventObject, aEvent ) } // XKeyListener -void OMRCListenerMultiplexerHelper::keyPressed(const KeyEvent& aEvent) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::keyPressed(const KeyEvent& aEvent) { MULTIPLEX( XKeyListener, keyPressed, KeyEvent, aEvent ) } // XKeyListener -void OMRCListenerMultiplexerHelper::keyReleased(const KeyEvent& aEvent) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::keyReleased(const KeyEvent& aEvent) { MULTIPLEX( XKeyListener, keyReleased, KeyEvent, aEvent ) } // XMouseListener -void OMRCListenerMultiplexerHelper::mousePressed(const MouseEvent& aEvent) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::mousePressed(const MouseEvent& aEvent) { MULTIPLEX( XMouseListener, mousePressed, MouseEvent, aEvent ) } // XMouseListener -void OMRCListenerMultiplexerHelper::mouseReleased(const MouseEvent& aEvent) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::mouseReleased(const MouseEvent& aEvent) { MULTIPLEX( XMouseListener, mouseReleased, MouseEvent, aEvent ) } // XMouseListener -void OMRCListenerMultiplexerHelper::mouseEntered(const MouseEvent& aEvent) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::mouseEntered(const MouseEvent& aEvent) { MULTIPLEX( XMouseListener, mouseEntered, MouseEvent, aEvent ) } // XMouseListener -void OMRCListenerMultiplexerHelper::mouseExited(const MouseEvent& aEvent) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::mouseExited(const MouseEvent& aEvent) { MULTIPLEX( XMouseListener, mouseExited, MouseEvent, aEvent ) } // XMouseMotionListener -void OMRCListenerMultiplexerHelper::mouseDragged(const MouseEvent& aEvent) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::mouseDragged(const MouseEvent& aEvent) { MULTIPLEX( XMouseMotionListener, mouseDragged, MouseEvent, aEvent ) } // XMouseMotionListener -void OMRCListenerMultiplexerHelper::mouseMoved(const MouseEvent& aEvent) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::mouseMoved(const MouseEvent& aEvent) { MULTIPLEX( XMouseMotionListener, mouseMoved, MouseEvent, aEvent ) } // XPaintListener -void OMRCListenerMultiplexerHelper::windowPaint(const PaintEvent& aEvent) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::windowPaint(const PaintEvent& aEvent) { MULTIPLEX( XPaintListener, windowPaint, PaintEvent, aEvent ) } // XTopWindowListener -void OMRCListenerMultiplexerHelper::windowOpened(const EventObject& aEvent) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::windowOpened(const EventObject& aEvent) { MULTIPLEX( XTopWindowListener, windowOpened, EventObject, aEvent ) } // XTopWindowListener -void OMRCListenerMultiplexerHelper::windowClosing( const EventObject& aEvent ) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::windowClosing( const EventObject& aEvent ) { MULTIPLEX( XTopWindowListener, windowClosing, EventObject, aEvent ) } // XTopWindowListener -void OMRCListenerMultiplexerHelper::windowClosed( const EventObject& aEvent ) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::windowClosed( const EventObject& aEvent ) { MULTIPLEX( XTopWindowListener, windowClosed, EventObject, aEvent ) } // XTopWindowListener -void OMRCListenerMultiplexerHelper::windowMinimized( const EventObject& aEvent ) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::windowMinimized( const EventObject& aEvent ) { MULTIPLEX( XTopWindowListener, windowMinimized, EventObject, aEvent ) } // XTopWindowListener -void OMRCListenerMultiplexerHelper::windowNormalized( const EventObject& aEvent ) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::windowNormalized( const EventObject& aEvent ) { MULTIPLEX( XTopWindowListener, windowNormalized, EventObject, aEvent ) } // XTopWindowListener -void OMRCListenerMultiplexerHelper::windowActivated( const EventObject& aEvent ) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::windowActivated( const EventObject& aEvent ) { MULTIPLEX( XTopWindowListener, windowActivated, EventObject, aEvent ) } // XTopWindowListener -void OMRCListenerMultiplexerHelper::windowDeactivated( const EventObject& aEvent ) throw( RuntimeException, std::exception ) +void OMRCListenerMultiplexerHelper::windowDeactivated( const EventObject& aEvent ) { MULTIPLEX( XTopWindowListener, windowDeactivated, EventObject, aEvent ) } diff --git a/UnoControls/source/base/registercontrols.cxx b/UnoControls/source/base/registercontrols.cxx index 09de6a5716f9..4b83ed611d12 100644 --- a/UnoControls/source/base/registercontrols.cxx +++ b/UnoControls/source/base/registercontrols.cxx @@ -35,7 +35,6 @@ namespace { css::uno::Reference SAL_CALL FrameControl_createInstance( css::uno::Reference const & rServiceManager) - throw (css::uno::Exception) { return static_cast( new unocontrols::FrameControl( @@ -46,7 +45,6 @@ css::uno::Reference SAL_CALL FrameControl_createInstance( css::uno::Reference SAL_CALL ProgressBar_createInstance( css::uno::Reference const & rServiceManager) - throw (css::uno::Exception) { return static_cast( new unocontrols::ProgressBar( @@ -58,7 +56,6 @@ css::uno::Reference SAL_CALL ProgressMonitor_createInstance( css::uno::Reference const & rServiceManager) - throw (css::uno::Exception) { return static_cast( new unocontrols::ProgressMonitor( @@ -70,7 +67,6 @@ css::uno::Reference SAL_CALL StatusIndicator_createInstance( css::uno::Reference const & rServiceManager) - throw (css::uno::Exception) { return static_cast( new unocontrols::StatusIndicator( diff --git a/UnoControls/source/controls/OConnectionPointContainerHelper.cxx b/UnoControls/source/controls/OConnectionPointContainerHelper.cxx index ee1827691d6b..f631759ae87c 100644 --- a/UnoControls/source/controls/OConnectionPointContainerHelper.cxx +++ b/UnoControls/source/controls/OConnectionPointContainerHelper.cxx @@ -46,7 +46,7 @@ OConnectionPointContainerHelper::~OConnectionPointContainerHelper() // XInterface -Any SAL_CALL OConnectionPointContainerHelper::queryInterface( const Type& aType ) throw( RuntimeException, std::exception ) +Any SAL_CALL OConnectionPointContainerHelper::queryInterface( const Type& aType ) { // Attention: // Don't use mutex or guard in this method!!! Is a method of XInterface. @@ -91,7 +91,7 @@ void SAL_CALL OConnectionPointContainerHelper::release() throw() // XConnectionPointContainer -Sequence< Type > SAL_CALL OConnectionPointContainerHelper::getConnectionPointTypes() throw( RuntimeException, std::exception ) +Sequence< Type > SAL_CALL OConnectionPointContainerHelper::getConnectionPointTypes() { // Container is threadsafe himself ! return m_aMultiTypeContainer.getContainedTypes(); @@ -99,7 +99,7 @@ Sequence< Type > SAL_CALL OConnectionPointContainerHelper::getConnectionPointTyp // XConnectionPointContainer -Reference< XConnectionPoint > SAL_CALL OConnectionPointContainerHelper::queryConnectionPoint( const Type& aType ) throw( RuntimeException, std::exception ) +Reference< XConnectionPoint > SAL_CALL OConnectionPointContainerHelper::queryConnectionPoint( const Type& aType ) { // Set default return value, if method failed. Reference< XConnectionPoint > xConnectionPoint; @@ -121,7 +121,7 @@ Reference< XConnectionPoint > SAL_CALL OConnectionPointContainerHelper::queryCon // XConnectionPointContainer void SAL_CALL OConnectionPointContainerHelper::advise( const Type& aType , - const Reference< XInterface >& xListener ) throw( RuntimeException, std::exception ) + const Reference< XInterface >& xListener ) { // Container is threadsafe himself ! m_aMultiTypeContainer.addInterface( aType, xListener ); @@ -130,7 +130,7 @@ void SAL_CALL OConnectionPointContainerHelper::advise( const Type& // XConnectionPointContainer void SAL_CALL OConnectionPointContainerHelper::unadvise( const Type& aType , - const Reference< XInterface >& xListener ) throw( RuntimeException, std::exception ) + const Reference< XInterface >& xListener ) { // Container is threadsafe himself ! m_aMultiTypeContainer.removeInterface( aType, xListener ); diff --git a/UnoControls/source/controls/OConnectionPointHelper.cxx b/UnoControls/source/controls/OConnectionPointHelper.cxx index 28692a405b38..6d51bb236408 100644 --- a/UnoControls/source/controls/OConnectionPointHelper.cxx +++ b/UnoControls/source/controls/OConnectionPointHelper.cxx @@ -51,7 +51,7 @@ OConnectionPointHelper::~OConnectionPointHelper() // XInterface -Any SAL_CALL OConnectionPointHelper::queryInterface( const Type& aType ) throw( RuntimeException, std::exception ) +Any SAL_CALL OConnectionPointHelper::queryInterface( const Type& aType ) { // Attention: // Don't use mutex or guard in this method!!! Is a method of XInterface. @@ -96,7 +96,7 @@ void SAL_CALL OConnectionPointHelper::release() throw() // XConnectionPoint -Type SAL_CALL OConnectionPointHelper::getConnectionType() throw( RuntimeException, std::exception ) +Type SAL_CALL OConnectionPointHelper::getConnectionType() { // Ready for multithreading MutexGuard aGuard( m_aSharedMutex ); @@ -118,7 +118,7 @@ Type SAL_CALL OConnectionPointHelper::getConnectionType() throw( RuntimeExceptio // XConnectionPoint -Reference< XConnectionPointContainer > SAL_CALL OConnectionPointHelper::getConnectionPointContainer() throw( RuntimeException, std::exception ) +Reference< XConnectionPointContainer > SAL_CALL OConnectionPointHelper::getConnectionPointContainer() { // Ready for multithreading MutexGuard aGuard( m_aSharedMutex ); @@ -128,9 +128,7 @@ Reference< XConnectionPointContainer > SAL_CALL OConnectionPointHelper::getConne // XConnectionPoint -void SAL_CALL OConnectionPointHelper::advise( const Reference< XInterface >& xListener ) throw( ListenerExistException , - InvalidListenerException , - RuntimeException, std::exception ) +void SAL_CALL OConnectionPointHelper::advise( const Reference< XInterface >& xListener ) { // Ready for multithreading MutexGuard aGuard( m_aSharedMutex ); @@ -161,7 +159,7 @@ void SAL_CALL OConnectionPointHelper::advise( const Reference< XInterface >& xLi // XConnectionPoint -void SAL_CALL OConnectionPointHelper::unadvise( const Reference< XInterface >& xListener ) throw( RuntimeException, std::exception ) +void SAL_CALL OConnectionPointHelper::unadvise( const Reference< XInterface >& xListener ) { // Ready for multithreading MutexGuard aGuard( m_aSharedMutex ); @@ -180,7 +178,7 @@ void SAL_CALL OConnectionPointHelper::unadvise( const Reference< XInterface >& x // XConnectionPoint -Sequence< Reference< XInterface > > SAL_CALL OConnectionPointHelper::getConnections() throw( RuntimeException, std::exception ) +Sequence< Reference< XInterface > > SAL_CALL OConnectionPointHelper::getConnections() { // Ready for multithreading MutexGuard aGuard( m_aSharedMutex ); diff --git a/UnoControls/source/controls/framecontrol.cxx b/UnoControls/source/controls/framecontrol.cxx index 091a86dec91d..ed9b15e2870a 100644 --- a/UnoControls/source/controls/framecontrol.cxx +++ b/UnoControls/source/controls/framecontrol.cxx @@ -60,7 +60,7 @@ FrameControl::~FrameControl() // XInterface -Any SAL_CALL FrameControl::queryInterface( const Type& rType ) throw( RuntimeException, std::exception ) +Any SAL_CALL FrameControl::queryInterface( const Type& rType ) { // Attention: // Don't use mutex or guard in this method!!! Is a method of XInterface. @@ -105,7 +105,7 @@ void SAL_CALL FrameControl::release() throw() // XTypeProvider -Sequence< Type > SAL_CALL FrameControl::getTypes() throw( RuntimeException, std::exception ) +Sequence< Type > SAL_CALL FrameControl::getTypes() { // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! @@ -136,7 +136,7 @@ Sequence< Type > SAL_CALL FrameControl::getTypes() throw( RuntimeException, std: // XAggregation -Any SAL_CALL FrameControl::queryAggregation( const Type& aType ) throw( RuntimeException, std::exception ) +Any SAL_CALL FrameControl::queryAggregation( const Type& aType ) { // Ask for my own supported interfaces ... // Attention: XTypeProvider and XInterface are supported by OComponentHelper! @@ -161,13 +161,11 @@ Any SAL_CALL FrameControl::queryAggregation( const Type& aType ) throw( RuntimeE } OUString FrameControl::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return impl_getStaticImplementationName(); } css::uno::Sequence FrameControl::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { return impl_getStaticSupportedServiceNames(); } @@ -175,7 +173,7 @@ css::uno::Sequence FrameControl::getSupportedServiceNames() // XControl void SAL_CALL FrameControl::createPeer( const Reference< XToolkit >& xToolkit , - const Reference< XWindowPeer >& xParentPeer ) throw( RuntimeException, std::exception ) + const Reference< XWindowPeer >& xParentPeer ) { BaseControl::createPeer( xToolkit, xParentPeer ); if ( impl_getPeerWindow().is() ) @@ -189,7 +187,7 @@ void SAL_CALL FrameControl::createPeer( const Reference< XToolkit >& xToo // XControl -sal_Bool SAL_CALL FrameControl::setModel( const Reference< XControlModel >& /*xModel*/ ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL FrameControl::setModel( const Reference< XControlModel >& /*xModel*/ ) { // We have no model. return false; @@ -197,7 +195,7 @@ sal_Bool SAL_CALL FrameControl::setModel( const Reference< XControlModel >& /*xM // XControl -Reference< XControlModel > SAL_CALL FrameControl::getModel() throw( RuntimeException, std::exception ) +Reference< XControlModel > SAL_CALL FrameControl::getModel() { // We have no model. return Reference< XControlModel >(); @@ -205,7 +203,7 @@ Reference< XControlModel > SAL_CALL FrameControl::getModel() throw( RuntimeExcep // XControl -void SAL_CALL FrameControl::dispose() throw( RuntimeException, std::exception ) +void SAL_CALL FrameControl::dispose() { impl_deleteFrame(); BaseControl::dispose(); @@ -213,7 +211,7 @@ void SAL_CALL FrameControl::dispose() throw( RuntimeException, std::exception ) // XView -sal_Bool SAL_CALL FrameControl::setGraphics( const Reference< XGraphics >& /*xDevice*/ ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL FrameControl::setGraphics( const Reference< XGraphics >& /*xDevice*/ ) { // it is not possible to print this control return false; @@ -221,7 +219,7 @@ sal_Bool SAL_CALL FrameControl::setGraphics( const Reference< XGraphics >& /*xDe // XView -Reference< XGraphics > SAL_CALL FrameControl::getGraphics() throw( RuntimeException, std::exception ) +Reference< XGraphics > SAL_CALL FrameControl::getGraphics() { // when it's not possible to set graphics ! then it's possible to return null return Reference< XGraphics >(); @@ -229,7 +227,7 @@ Reference< XGraphics > SAL_CALL FrameControl::getGraphics() throw( RuntimeExcept // XConnectionPointContainer -Sequence< Type > SAL_CALL FrameControl::getConnectionPointTypes() throw( RuntimeException, std::exception ) +Sequence< Type > SAL_CALL FrameControl::getConnectionPointTypes() { // Forwarded to helper class return m_aConnectionPointContainer->getConnectionPointTypes(); @@ -237,7 +235,7 @@ Sequence< Type > SAL_CALL FrameControl::getConnectionPointTypes() throw( Runtime // XConnectionPointContainer -Reference< XConnectionPoint > SAL_CALL FrameControl::queryConnectionPoint( const Type& aType ) throw( RuntimeException, std::exception ) +Reference< XConnectionPoint > SAL_CALL FrameControl::queryConnectionPoint( const Type& aType ) { // Forwarded to helper class return m_aConnectionPointContainer->queryConnectionPoint( aType ); @@ -246,7 +244,7 @@ Reference< XConnectionPoint > SAL_CALL FrameControl::queryConnectionPoint( const // XConnectionPointContainer void SAL_CALL FrameControl::advise( const Type& aType , - const Reference< XInterface >& xListener ) throw( RuntimeException, std::exception ) + const Reference< XInterface >& xListener ) { // Forwarded to helper class m_aConnectionPointContainer->advise( aType, xListener ); @@ -255,7 +253,7 @@ void SAL_CALL FrameControl::advise( const Type& aType // XConnectionPointContainer void SAL_CALL FrameControl::unadvise( const Type& aType , - const Reference< XInterface >& xListener ) throw( RuntimeException, std::exception ) + const Reference< XInterface >& xListener ) { // Forwarded to helper class m_aConnectionPointContainer->unadvise( aType, xListener ); @@ -281,7 +279,7 @@ const OUString FrameControl::impl_getStaticImplementationName() sal_Bool FrameControl::convertFastPropertyValue( Any& rConvertedValue , Any& rOldValue , sal_Int32 nHandle , - const Any& rValue ) throw( IllegalArgumentException ) + const Any& rValue ) { bool bReturn = false; switch (nHandle) @@ -309,7 +307,6 @@ sal_Bool FrameControl::convertFastPropertyValue( Any& rConvertedVa void FrameControl::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , const Any& rValue ) - throw ( css::uno::Exception, std::exception ) { // this method only set the value MutexGuard aGuard (m_aMutex); @@ -374,7 +371,7 @@ IPropertyArrayHelper& FrameControl::getInfoHelper() // OPropertySetHelper -Reference< XPropertySetInfo > SAL_CALL FrameControl::getPropertySetInfo() throw( RuntimeException, std::exception ) +Reference< XPropertySetInfo > SAL_CALL FrameControl::getPropertySetInfo() { // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! diff --git a/UnoControls/source/controls/progressbar.cxx b/UnoControls/source/controls/progressbar.cxx index 7fa718d6a064..99ae92d97d98 100644 --- a/UnoControls/source/controls/progressbar.cxx +++ b/UnoControls/source/controls/progressbar.cxx @@ -59,7 +59,7 @@ ProgressBar::~ProgressBar() // XInterface -Any SAL_CALL ProgressBar::queryInterface( const Type& rType ) throw( RuntimeException, std::exception ) +Any SAL_CALL ProgressBar::queryInterface( const Type& rType ) { // Attention: // Don't use mutex or guard in this method!!! Is a method of XInterface. @@ -104,7 +104,7 @@ void SAL_CALL ProgressBar::release() throw() // XTypeProvider -Sequence< Type > SAL_CALL ProgressBar::getTypes() throw( RuntimeException, std::exception ) +Sequence< Type > SAL_CALL ProgressBar::getTypes() { // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! @@ -134,7 +134,7 @@ Sequence< Type > SAL_CALL ProgressBar::getTypes() throw( RuntimeException, std:: // XAggregation -Any SAL_CALL ProgressBar::queryAggregation( const Type& aType ) throw( RuntimeException, std::exception ) +Any SAL_CALL ProgressBar::queryAggregation( const Type& aType ) { // Ask for my own supported interfaces ... // Attention: XTypeProvider and XInterface are supported by OComponentHelper! @@ -156,7 +156,7 @@ Any SAL_CALL ProgressBar::queryAggregation( const Type& aType ) throw( RuntimeEx // XProgressBar -void SAL_CALL ProgressBar::setForegroundColor( sal_Int32 nColor ) throw( RuntimeException, std::exception ) +void SAL_CALL ProgressBar::setForegroundColor( sal_Int32 nColor ) { // Ready for multithreading MutexGuard aGuard (m_aMutex); @@ -170,7 +170,7 @@ void SAL_CALL ProgressBar::setForegroundColor( sal_Int32 nColor ) throw( Runtime // XProgressBar -void SAL_CALL ProgressBar::setBackgroundColor ( sal_Int32 nColor ) throw( RuntimeException, std::exception ) +void SAL_CALL ProgressBar::setBackgroundColor ( sal_Int32 nColor ) { // Ready for multithreading MutexGuard aGuard (m_aMutex); @@ -184,7 +184,7 @@ void SAL_CALL ProgressBar::setBackgroundColor ( sal_Int32 nColor ) throw( Runtim // XProgressBar -void SAL_CALL ProgressBar::setValue ( sal_Int32 nValue ) throw( RuntimeException, std::exception ) +void SAL_CALL ProgressBar::setValue ( sal_Int32 nValue ) { // This method is defined for follow things: // 1) Values >= _nMinRange @@ -213,7 +213,7 @@ void SAL_CALL ProgressBar::setValue ( sal_Int32 nValue ) throw( RuntimeException // XProgressBar -void SAL_CALL ProgressBar::setRange ( sal_Int32 nMin, sal_Int32 nMax ) throw( RuntimeException, std::exception ) +void SAL_CALL ProgressBar::setRange ( sal_Int32 nMin, sal_Int32 nMax ) { // This method is defined for follow things: // 1) All values of sal_Int32 @@ -255,7 +255,7 @@ void SAL_CALL ProgressBar::setRange ( sal_Int32 nMin, sal_Int32 nMax ) throw( Ru // XProgressBar -sal_Int32 SAL_CALL ProgressBar::getValue () throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL ProgressBar::getValue () { // Ready for multithreading MutexGuard aGuard (m_aMutex); @@ -271,7 +271,7 @@ void SAL_CALL ProgressBar::setPosSize ( sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nFlags -) throw( RuntimeException, std::exception ) +) { // Take old size BEFORE you set the new values at baseclass! // You will control changes. At the other way, the values are the same! @@ -291,7 +291,7 @@ void SAL_CALL ProgressBar::setPosSize ( // XControl -sal_Bool SAL_CALL ProgressBar::setModel( const Reference< XControlModel >& /*xModel*/ ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL ProgressBar::setModel( const Reference< XControlModel >& /*xModel*/ ) { // A model is not possible for this control. return false; @@ -299,7 +299,7 @@ sal_Bool SAL_CALL ProgressBar::setModel( const Reference< XControlModel >& /*xMo // XControl -Reference< XControlModel > SAL_CALL ProgressBar::getModel() throw( RuntimeException, std::exception ) +Reference< XControlModel > SAL_CALL ProgressBar::getModel() { // A model is not possible for this control. return Reference< XControlModel >(); diff --git a/UnoControls/source/controls/progressmonitor.cxx b/UnoControls/source/controls/progressmonitor.cxx index 79bc853265d9..06a7d404d90b 100644 --- a/UnoControls/source/controls/progressmonitor.cxx +++ b/UnoControls/source/controls/progressmonitor.cxx @@ -103,7 +103,7 @@ ProgressMonitor::~ProgressMonitor() } // XInterface -Any SAL_CALL ProgressMonitor::queryInterface( const Type& rType ) throw( RuntimeException, std::exception ) +Any SAL_CALL ProgressMonitor::queryInterface( const Type& rType ) { // Attention: // Don't use mutex or guard in this method!!! Is a method of XInterface. @@ -145,7 +145,7 @@ void SAL_CALL ProgressMonitor::release() throw() } // XTypeProvider -Sequence< Type > SAL_CALL ProgressMonitor::getTypes() throw( RuntimeException, std::exception ) +Sequence< Type > SAL_CALL ProgressMonitor::getTypes() { // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! @@ -175,7 +175,7 @@ Sequence< Type > SAL_CALL ProgressMonitor::getTypes() throw( RuntimeException, s } // XAggregation -Any SAL_CALL ProgressMonitor::queryAggregation( const Type& aType ) throw( RuntimeException, std::exception ) +Any SAL_CALL ProgressMonitor::queryAggregation( const Type& aType ) { // Ask for my own supported interfaces ... // Attention: XTypeProvider and XInterface are supported by OComponentHelper! @@ -201,7 +201,7 @@ void SAL_CALL ProgressMonitor::addText( const OUString& rTopic, const OUString& rText, sal_Bool bbeforeProgress -) throw( RuntimeException, std::exception ) +) { // Safe impossible cases // Check valid call of this method. @@ -240,7 +240,7 @@ void SAL_CALL ProgressMonitor::addText( } // XProgressMonitor -void SAL_CALL ProgressMonitor::removeText ( const OUString& rTopic, sal_Bool bbeforeProgress ) throw( RuntimeException, std::exception ) +void SAL_CALL ProgressMonitor::removeText ( const OUString& rTopic, sal_Bool bbeforeProgress ) { // Safe impossible cases // Check valid call of this method. @@ -283,7 +283,7 @@ void SAL_CALL ProgressMonitor::updateText ( const OUString& rTopic, const OUString& rText, sal_Bool bbeforeProgress -) throw( RuntimeException, std::exception ) +) { // Safe impossible cases // Check valid call of this method. @@ -307,7 +307,7 @@ void SAL_CALL ProgressMonitor::updateText ( } // XProgressBar -void SAL_CALL ProgressMonitor::setForegroundColor ( sal_Int32 nColor ) throw( RuntimeException, std::exception ) +void SAL_CALL ProgressMonitor::setForegroundColor ( sal_Int32 nColor ) { // Ready for multithreading MutexGuard aGuard ( m_aMutex ); @@ -316,7 +316,7 @@ void SAL_CALL ProgressMonitor::setForegroundColor ( sal_Int32 nColor ) throw( Ru } // XProgressBar -void SAL_CALL ProgressMonitor::setBackgroundColor ( sal_Int32 nColor ) throw( RuntimeException, std::exception ) +void SAL_CALL ProgressMonitor::setBackgroundColor ( sal_Int32 nColor ) { // Ready for multithreading MutexGuard aGuard ( m_aMutex ); @@ -325,7 +325,7 @@ void SAL_CALL ProgressMonitor::setBackgroundColor ( sal_Int32 nColor ) throw( Ru } // XProgressBar -void SAL_CALL ProgressMonitor::setValue ( sal_Int32 nValue ) throw( RuntimeException, std::exception ) +void SAL_CALL ProgressMonitor::setValue ( sal_Int32 nValue ) { // Ready for multithreading MutexGuard aGuard ( m_aMutex ); @@ -334,7 +334,7 @@ void SAL_CALL ProgressMonitor::setValue ( sal_Int32 nValue ) throw( RuntimeExcep } // XProgressBar -void SAL_CALL ProgressMonitor::setRange ( sal_Int32 nMin, sal_Int32 nMax ) throw( RuntimeException, std::exception ) +void SAL_CALL ProgressMonitor::setRange ( sal_Int32 nMin, sal_Int32 nMax ) { // Ready for multithreading MutexGuard aGuard ( m_aMutex ); @@ -343,7 +343,7 @@ void SAL_CALL ProgressMonitor::setRange ( sal_Int32 nMin, sal_Int32 nMax ) throw } // XProgressBar -sal_Int32 SAL_CALL ProgressMonitor::getValue () throw( RuntimeException, std::exception ) +sal_Int32 SAL_CALL ProgressMonitor::getValue () { // Ready for multithreading MutexGuard aGuard ( m_aMutex ); @@ -352,7 +352,7 @@ sal_Int32 SAL_CALL ProgressMonitor::getValue () throw( RuntimeException, std::ex } // XButton -void SAL_CALL ProgressMonitor::addActionListener ( const css::uno::Reference< XActionListener > & rListener ) throw( RuntimeException, std::exception ) +void SAL_CALL ProgressMonitor::addActionListener ( const css::uno::Reference< XActionListener > & rListener ) { // Ready for multithreading MutexGuard aGuard ( m_aMutex ); @@ -364,7 +364,7 @@ void SAL_CALL ProgressMonitor::addActionListener ( const css::uno::Reference< XA } // XButton -void SAL_CALL ProgressMonitor::removeActionListener ( const css::uno::Reference< XActionListener > & rListener ) throw( RuntimeException, std::exception ) +void SAL_CALL ProgressMonitor::removeActionListener ( const css::uno::Reference< XActionListener > & rListener ) { // Ready for multithreading MutexGuard aGuard ( m_aMutex ); @@ -376,7 +376,7 @@ void SAL_CALL ProgressMonitor::removeActionListener ( const css::uno::Reference< } // XButton -void SAL_CALL ProgressMonitor::setLabel ( const OUString& rLabel ) throw( RuntimeException, std::exception ) +void SAL_CALL ProgressMonitor::setLabel ( const OUString& rLabel ) { // Ready for multithreading MutexGuard aGuard ( m_aMutex ); @@ -388,7 +388,7 @@ void SAL_CALL ProgressMonitor::setLabel ( const OUString& rLabel ) throw( Runtim } // XButton -void SAL_CALL ProgressMonitor::setActionCommand ( const OUString& rCommand ) throw( RuntimeException, std::exception ) +void SAL_CALL ProgressMonitor::setActionCommand ( const OUString& rCommand ) { // Ready for multithreading MutexGuard aGuard ( m_aMutex ); @@ -400,13 +400,13 @@ void SAL_CALL ProgressMonitor::setActionCommand ( const OUString& rCommand ) thr } // XLayoutConstrains -Size SAL_CALL ProgressMonitor::getMinimumSize () throw( RuntimeException, std::exception ) +Size SAL_CALL ProgressMonitor::getMinimumSize () { return Size (PROGRESSMONITOR_DEFAULT_WIDTH, PROGRESSMONITOR_DEFAULT_HEIGHT); } // XLayoutConstrains -Size SAL_CALL ProgressMonitor::getPreferredSize () throw( RuntimeException, std::exception ) +Size SAL_CALL ProgressMonitor::getPreferredSize () { // Ready for multithreading ClearableMutexGuard aGuard ( m_aMutex ); @@ -450,13 +450,13 @@ Size SAL_CALL ProgressMonitor::getPreferredSize () throw( RuntimeException, std: } // XLayoutConstrains -Size SAL_CALL ProgressMonitor::calcAdjustedSize ( const Size& /*rNewSize*/ ) throw( RuntimeException, std::exception ) +Size SAL_CALL ProgressMonitor::calcAdjustedSize ( const Size& /*rNewSize*/ ) { return getPreferredSize (); } // XControl -void SAL_CALL ProgressMonitor::createPeer ( const css::uno::Reference< XToolkit > & rToolkit, const css::uno::Reference< XWindowPeer > & rParent ) throw( RuntimeException, std::exception ) +void SAL_CALL ProgressMonitor::createPeer ( const css::uno::Reference< XToolkit > & rToolkit, const css::uno::Reference< XWindowPeer > & rParent ) { if (!getPeer().is()) { @@ -471,14 +471,14 @@ void SAL_CALL ProgressMonitor::createPeer ( const css::uno::Reference< XToolkit } // XControl -sal_Bool SAL_CALL ProgressMonitor::setModel ( const css::uno::Reference< XControlModel > & /*rModel*/ ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL ProgressMonitor::setModel ( const css::uno::Reference< XControlModel > & /*rModel*/ ) { // We have no model. return false; } // XControl -css::uno::Reference< XControlModel > SAL_CALL ProgressMonitor::getModel () throw( RuntimeException, std::exception ) +css::uno::Reference< XControlModel > SAL_CALL ProgressMonitor::getModel () { // We have no model. // return (XControlModel*)this; @@ -486,7 +486,7 @@ css::uno::Reference< XControlModel > SAL_CALL ProgressMonitor::getModel () throw } // XComponent -void SAL_CALL ProgressMonitor::dispose () throw( RuntimeException, std::exception ) +void SAL_CALL ProgressMonitor::dispose () { // Ready for multithreading MutexGuard aGuard ( m_aMutex ); @@ -518,7 +518,7 @@ void SAL_CALL ProgressMonitor::dispose () throw( RuntimeException, std::exceptio } // XWindow -void SAL_CALL ProgressMonitor::setPosSize ( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nFlags ) throw( RuntimeException, std::exception ) +void SAL_CALL ProgressMonitor::setPosSize ( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nFlags ) { Rectangle aBasePosSize = getPosSize (); BaseContainerControl::setPosSize (nX, nY, nWidth, nHeight, nFlags); diff --git a/UnoControls/source/controls/statusindicator.cxx b/UnoControls/source/controls/statusindicator.cxx index a9c901dad70a..5b303f2a63f5 100644 --- a/UnoControls/source/controls/statusindicator.cxx +++ b/UnoControls/source/controls/statusindicator.cxx @@ -68,7 +68,7 @@ StatusIndicator::~StatusIndicator() {} // XInterface -Any SAL_CALL StatusIndicator::queryInterface( const Type& rType ) throw( RuntimeException, std::exception ) +Any SAL_CALL StatusIndicator::queryInterface( const Type& rType ) { // Attention: // Don't use mutex or guard in this method!!! Is a method of XInterface. @@ -113,7 +113,7 @@ void SAL_CALL StatusIndicator::release() throw() // XTypeProvider -Sequence< Type > SAL_CALL StatusIndicator::getTypes() throw( RuntimeException, std::exception ) +Sequence< Type > SAL_CALL StatusIndicator::getTypes() { // Optimize this method ! // We initialize a static variable only one time. And we don't must use a mutex at every call! @@ -143,7 +143,7 @@ Sequence< Type > SAL_CALL StatusIndicator::getTypes() throw( RuntimeException, s // XAggregation -Any SAL_CALL StatusIndicator::queryAggregation( const Type& aType ) throw( RuntimeException, std::exception ) +Any SAL_CALL StatusIndicator::queryAggregation( const Type& aType ) { // Ask for my own supported interfaces ... // Attention: XTypeProvider and XInterface are supported by OComponentHelper! @@ -165,7 +165,7 @@ Any SAL_CALL StatusIndicator::queryAggregation( const Type& aType ) throw( Runti // XStatusIndicator -void SAL_CALL StatusIndicator::start( const OUString& sText, sal_Int32 nRange ) throw( RuntimeException, std::exception ) +void SAL_CALL StatusIndicator::start( const OUString& sText, sal_Int32 nRange ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -179,7 +179,7 @@ void SAL_CALL StatusIndicator::start( const OUString& sText, sal_Int32 nRange ) // XStatusIndicator -void SAL_CALL StatusIndicator::end() throw( RuntimeException, std::exception ) +void SAL_CALL StatusIndicator::end() { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -192,7 +192,7 @@ void SAL_CALL StatusIndicator::end() throw( RuntimeException, std::exception ) // XStatusIndicator -void SAL_CALL StatusIndicator::setText( const OUString& sText ) throw( RuntimeException, std::exception ) +void SAL_CALL StatusIndicator::setText( const OUString& sText ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -203,7 +203,7 @@ void SAL_CALL StatusIndicator::setText( const OUString& sText ) throw( RuntimeEx // XStatusIndicator -void SAL_CALL StatusIndicator::setValue( sal_Int32 nValue ) throw( RuntimeException, std::exception ) +void SAL_CALL StatusIndicator::setValue( sal_Int32 nValue ) { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -214,7 +214,7 @@ void SAL_CALL StatusIndicator::setValue( sal_Int32 nValue ) throw( RuntimeExcept // XStatusIndicator -void SAL_CALL StatusIndicator::reset() throw( RuntimeException, std::exception ) +void SAL_CALL StatusIndicator::reset() { // Ready for multithreading MutexGuard aGuard( m_aMutex ); @@ -227,14 +227,14 @@ void SAL_CALL StatusIndicator::reset() throw( RuntimeException, std::exception ) // XLayoutConstrains -Size SAL_CALL StatusIndicator::getMinimumSize () throw( RuntimeException, std::exception ) +Size SAL_CALL StatusIndicator::getMinimumSize () { return Size (STATUSINDICATOR_DEFAULT_WIDTH, STATUSINDICATOR_DEFAULT_HEIGHT); } // XLayoutConstrains -Size SAL_CALL StatusIndicator::getPreferredSize () throw( RuntimeException, std::exception ) +Size SAL_CALL StatusIndicator::getPreferredSize () { // Ready for multithreading ClearableMutexGuard aGuard ( m_aMutex ); @@ -265,7 +265,7 @@ Size SAL_CALL StatusIndicator::getPreferredSize () throw( RuntimeException, std: // XLayoutConstrains -Size SAL_CALL StatusIndicator::calcAdjustedSize ( const Size& /*rNewSize*/ ) throw( RuntimeException, std::exception ) +Size SAL_CALL StatusIndicator::calcAdjustedSize ( const Size& /*rNewSize*/ ) { return getPreferredSize (); } @@ -275,7 +275,7 @@ Size SAL_CALL StatusIndicator::calcAdjustedSize ( const Size& /*rNewSize*/ ) thr void SAL_CALL StatusIndicator::createPeer ( const css::uno::Reference< XToolkit > & rToolkit, const css::uno::Reference< XWindowPeer > & rParent -) throw( RuntimeException, std::exception ) +) { if( !getPeer().is() ) { @@ -291,7 +291,7 @@ void SAL_CALL StatusIndicator::createPeer ( // XControl -sal_Bool SAL_CALL StatusIndicator::setModel ( const css::uno::Reference< XControlModel > & /*rModel*/ ) throw( RuntimeException, std::exception ) +sal_Bool SAL_CALL StatusIndicator::setModel ( const css::uno::Reference< XControlModel > & /*rModel*/ ) { // We have no model. return false; @@ -299,7 +299,7 @@ sal_Bool SAL_CALL StatusIndicator::setModel ( const css::uno::Reference< XContro // XControl -css::uno::Reference< XControlModel > SAL_CALL StatusIndicator::getModel () throw( RuntimeException, std::exception ) +css::uno::Reference< XControlModel > SAL_CALL StatusIndicator::getModel () { // We have no model. // return (XControlModel*)this; @@ -308,7 +308,7 @@ css::uno::Reference< XControlModel > SAL_CALL StatusIndicator::getModel () throw // XComponent -void SAL_CALL StatusIndicator::dispose () throw( RuntimeException, std::exception ) +void SAL_CALL StatusIndicator::dispose () { // Ready for multithreading MutexGuard aGuard ( m_aMutex ); @@ -334,7 +334,7 @@ void SAL_CALL StatusIndicator::setPosSize ( sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nFlags -) throw( RuntimeException, std::exception ) +) { Rectangle aBasePosSize = getPosSize (); BaseContainerControl::setPosSize (nX, nY, nWidth, nHeight, nFlags); diff --git a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx index 31a95f5e42a4..abc4191e7bde 100644 --- a/UnoControls/source/inc/OConnectionPointContainerHelper.hxx +++ b/UnoControls/source/inc/OConnectionPointContainerHelper.hxx @@ -56,8 +56,7 @@ public: @onerror A RuntimeException is thrown. */ - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; /**_______________________________________________________________________________________________________ @short increment refcount @@ -79,22 +78,21 @@ public: // XConnectionPointContainer - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getConnectionPointTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getConnectionPointTypes() override; virtual css::uno::Reference< css::lang::XConnectionPoint > SAL_CALL queryConnectionPoint( const css::uno::Type& aType - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL advise( const css::uno::Type& aType , const css::uno::Reference< css::uno::XInterface >& xListener - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL unadvise( const css::uno::Type& aType , const css::uno::Reference< css::uno::XInterface >& xListener - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; // public but impl method! // Is necessary to get container member at OConnectionPoint-instance. diff --git a/UnoControls/source/inc/OConnectionPointHelper.hxx b/UnoControls/source/inc/OConnectionPointHelper.hxx index 371b70facdfa..2e86fc29f302 100644 --- a/UnoControls/source/inc/OConnectionPointHelper.hxx +++ b/UnoControls/source/inc/OConnectionPointHelper.hxx @@ -61,8 +61,7 @@ public: @onerror A RuntimeException is thrown. */ - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; /**_______________________________________________________________________________________________________ @short increment refcount @@ -84,25 +83,17 @@ public: // XConnectionPoint - virtual css::uno::Type SAL_CALL getConnectionType() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Type SAL_CALL getConnectionType() override; - virtual css::uno::Reference< css::lang::XConnectionPointContainer > SAL_CALL getConnectionPointContainer() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::lang::XConnectionPointContainer > SAL_CALL getConnectionPointContainer() override; virtual void SAL_CALL advise( const css::uno::Reference< css::uno::XInterface >& xListener - ) throw ( - css::lang::ListenerExistException, - css::lang::InvalidListenerException , - css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL unadvise( const css::uno::Reference< css::uno::XInterface >& xListener ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL unadvise( const css::uno::Reference< css::uno::XInterface >& xListener ) override; - virtual css::uno::Sequence< css::uno::Reference< css::uno::XInterface > > SAL_CALL getConnections() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Reference< css::uno::XInterface > > SAL_CALL getConnections() override; private: diff --git a/UnoControls/source/inc/framecontrol.hxx b/UnoControls/source/inc/framecontrol.hxx index ff28dadcf858..f087a1a43107 100644 --- a/UnoControls/source/inc/framecontrol.hxx +++ b/UnoControls/source/inc/framecontrol.hxx @@ -71,7 +71,7 @@ public: virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; /**_______________________________________________________________________________________________________ @short increment refcount @@ -93,66 +93,60 @@ public: // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XAggregation css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; - OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + OUString SAL_CALL getImplementationName() override; - css::uno::Sequence SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Sequence SAL_CALL getSupportedServiceNames() override; // XControl virtual void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& xToolkit , const css::uno::Reference< css::awt::XWindowPeer >& xParent - ) throw ( css::uno::RuntimeException, std::exception ) override; + ) override; virtual sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& xModel - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; - virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel() override; // XComponent - virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispose() override; // XView virtual sal_Bool SAL_CALL setGraphics( const css::uno::Reference< css::awt::XGraphics >& xDevice - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; - virtual css::uno::Reference< css::awt::XGraphics > SAL_CALL getGraphics() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::awt::XGraphics > SAL_CALL getGraphics() override; // XConnectionPointContainer - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getConnectionPointTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getConnectionPointTypes() override; virtual css::uno::Reference< css::lang::XConnectionPoint > SAL_CALL queryConnectionPoint( const css::uno::Type& aType - ) throw ( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL advise( const css::uno::Type& aType , const css::uno::Reference< css::uno::XInterface >& xListener - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL unadvise( const css::uno::Type& aType , const css::uno::Reference< css::uno::XInterface >& xListener - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; // impl but public methods to register service! @@ -172,12 +166,12 @@ protected: css::uno::Any& rOldValue , sal_Int32 nHandle , const css::uno::Any& rValue - ) throw( css::lang::IllegalArgumentException ) override; + ) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle , const css::uno::Any& rValue - ) throw ( css::uno::Exception, std::exception ) override; + ) override; virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue , sal_Int32 nHandle ) const override; @@ -186,8 +180,7 @@ protected: // XPropertySet - css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw( css::uno::RuntimeException, std::exception ) override; + css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override; // BaseControl diff --git a/UnoControls/source/inc/progressbar.hxx b/UnoControls/source/inc/progressbar.hxx index e7523d778fba..768f273dc087 100644 --- a/UnoControls/source/inc/progressbar.hxx +++ b/UnoControls/source/inc/progressbar.hxx @@ -56,8 +56,7 @@ public: // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; /**_______________________________________________________________________________________________________ @short increment refcount @@ -79,30 +78,26 @@ public: // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XAggregation - css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) - throw( css::uno::RuntimeException, std::exception ) override; + css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) override; // XProgressBar - virtual void SAL_CALL setForegroundColor( sal_Int32 nColor ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setForegroundColor( sal_Int32 nColor ) override; - virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor ) override; - virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setValue( sal_Int32 nValue ) override; virtual void SAL_CALL setRange( sal_Int32 nMin , sal_Int32 nMax - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; - virtual sal_Int32 SAL_CALL getValue() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getValue() override; // XWindow @@ -112,16 +107,15 @@ public: sal_Int32 nWidth , sal_Int32 nHeight , sal_Int16 nFlags - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; // XControl virtual sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& xModel - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; - virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel() override; // BaseControl diff --git a/UnoControls/source/inc/progressmonitor.hxx b/UnoControls/source/inc/progressmonitor.hxx index 04044cc50fe2..027a8d3fdc9e 100644 --- a/UnoControls/source/inc/progressmonitor.hxx +++ b/UnoControls/source/inc/progressmonitor.hxx @@ -121,8 +121,7 @@ public: @onerror A RuntimeException is thrown. */ - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; /**_______________________________________________________________________________________________________ @short increment refcount @@ -152,12 +151,11 @@ public: @onerror A RuntimeException is thrown. */ - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XAggregation - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) override; // XProgressMonitor @@ -182,72 +180,68 @@ public: const OUString& sTopic , const OUString& sText , sal_Bool bbeforeProgress - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL removeText( const OUString& sTopic , sal_Bool bbeforeProgress - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL updateText( const OUString& sTopic , const OUString& sText , sal_Bool bbeforeProgress - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; // XProgressBar - virtual void SAL_CALL setForegroundColor( sal_Int32 nColor ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setForegroundColor( sal_Int32 nColor ) override; - virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setBackgroundColor( sal_Int32 nColor ) override; - virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setValue( sal_Int32 nValue ) override; virtual void SAL_CALL setRange( sal_Int32 nMin , - sal_Int32 nMax ) throw( css::uno::RuntimeException, std::exception ) override; + sal_Int32 nMax ) override; - virtual sal_Int32 SAL_CALL getValue() throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getValue() override; // XButton virtual void SAL_CALL addActionListener( const css::uno::Reference< css::awt::XActionListener >& xListener - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; virtual void SAL_CALL removeActionListener( const css::uno::Reference< css::awt::XActionListener >& xListener - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; - virtual void SAL_CALL setLabel( const OUString& sLabel ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setLabel( const OUString& sLabel ) override; - virtual void SAL_CALL setActionCommand( const OUString& sCommand ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setActionCommand( const OUString& sCommand ) override; // XLayoutConstrains - virtual css::awt::Size SAL_CALL getMinimumSize() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::awt::Size SAL_CALL getMinimumSize() override; - virtual css::awt::Size SAL_CALL getPreferredSize() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::awt::Size SAL_CALL getPreferredSize() override; - virtual css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) override; // XControl virtual void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& xToolkit , const css::uno::Reference< css::awt::XWindowPeer >& xParent - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; - virtual sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& xModel ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& xModel ) override; - virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel() override; // XComponent - virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispose() override; // XWindow @@ -255,7 +249,7 @@ public: sal_Int32 nY , sal_Int32 nWidth , sal_Int32 nHeight , - sal_Int16 nFlags ) throw( css::uno::RuntimeException, std::exception ) override; + sal_Int16 nFlags ) override; // BaseControl diff --git a/UnoControls/source/inc/statusindicator.hxx b/UnoControls/source/inc/statusindicator.hxx index b1e377c46f4d..cf49fd558684 100644 --- a/UnoControls/source/inc/statusindicator.hxx +++ b/UnoControls/source/inc/statusindicator.hxx @@ -78,8 +78,7 @@ class StatusIndicator : public css::awt::XLayoutConstrains @onerror A RuntimeException is thrown. */ - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; /**_______________________________________________________________________________________________________ @short increment refcount @@ -109,54 +108,49 @@ class StatusIndicator : public css::awt::XLayoutConstrains @onerror A RuntimeException is thrown. */ - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; // XAggregation - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) override; // XStatusIndicator virtual void SAL_CALL start( const OUString& sText , sal_Int32 nRange - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; - virtual void SAL_CALL end() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL end() override; - virtual void SAL_CALL reset() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL reset() override; - virtual void SAL_CALL setText( const OUString& sText ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setText( const OUString& sText ) override; - virtual void SAL_CALL setValue( sal_Int32 nValue ) throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL setValue( sal_Int32 nValue ) override; // XLayoutConstrains - virtual css::awt::Size SAL_CALL getMinimumSize() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::awt::Size SAL_CALL getMinimumSize() override; - virtual css::awt::Size SAL_CALL getPreferredSize() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::awt::Size SAL_CALL getPreferredSize() override; - virtual css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::awt::Size SAL_CALL calcAdjustedSize( const css::awt::Size& aNewSize ) override; // XControl virtual void SAL_CALL createPeer( const css::uno::Reference< css::awt::XToolkit >& xToolkit , const css::uno::Reference< css::awt::XWindowPeer >& xParent - ) throw( css::uno::RuntimeException, std::exception ) override; + ) override; - virtual sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& xModel ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL setModel( const css::uno::Reference< css::awt::XControlModel >& xModel ) override; - virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel() - throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::awt::XControlModel > SAL_CALL getModel() override; // XComponent - virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL dispose() override; // XWindow @@ -164,7 +158,7 @@ class StatusIndicator : public css::awt::XLayoutConstrains sal_Int32 nY , sal_Int32 nWidth , sal_Int32 nHeight , - sal_Int16 nFlags ) throw( css::uno::RuntimeException, std::exception ) override; + sal_Int16 nFlags ) override; // BaseControl diff --git a/accessibility/inc/extended/AccessibleBrowseBox.hxx b/accessibility/inc/extended/AccessibleBrowseBox.hxx index 69debf478f35..a2b31babbe13 100644 --- a/accessibility/inc/extended/AccessibleBrowseBox.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBox.hxx @@ -63,15 +63,12 @@ protected: // XAccessibleContext /** @return The count of visible children. */ - virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; /** @return The XAccessible interface of the specified child. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleChild( sal_Int32 nChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + getAccessibleChild( sal_Int32 nChildIndex ) override; // XAccessibleComponent @@ -80,20 +77,17 @@ protected: */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleAtPoint( const css::awt::Point& rPoint ) - throw ( css::uno::RuntimeException, std::exception ) override; + getAccessibleAtPoint( const css::awt::Point& rPoint ) override; /** Grabs the focus to the BrowseBox. */ - virtual void SAL_CALL grabFocus() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL grabFocus() override; // XServiceInfo /** @return The name of this class. */ - virtual OUString SAL_CALL getImplementationName() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; public: // helper functions @@ -216,7 +210,7 @@ protected: // XAccessible virtual css::uno::Reference< css::accessibility::XAccessibleContext > - SAL_CALL getAccessibleContext() throw ( css::uno::RuntimeException, std::exception ) override; + SAL_CALL getAccessibleContext() override; // IAccessibleBrowseBox virtual css::uno::Reference< css::accessibility::XAccessible > diff --git a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx index 81e81aa91c02..217e20a48ecb 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxBase.hxx @@ -115,45 +115,36 @@ public: // XAccessibleContext /** @return A reference to the parent accessible object. */ - virtual css::uno::Reference SAL_CALL getAccessibleParent() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference SAL_CALL getAccessibleParent() override; /** @return The index of this object among the parent's children. */ - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override; /** @return The description of this object. */ - virtual OUString SAL_CALL getAccessibleDescription() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getAccessibleDescription() override; /** @return The name of this object. */ - virtual OUString SAL_CALL getAccessibleName() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getAccessibleName() override; /** @return The relation set (the BrowseBox does not have one). */ - virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() override; /** @return The set of current states. */ - virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet() override; /** @return The parent's locale. */ - virtual css::lang::Locale SAL_CALL getLocale() - throw ( css::accessibility::IllegalAccessibleComponentStateException, - css::uno::RuntimeException, std::exception ) override; + virtual css::lang::Locale SAL_CALL getLocale() override; /** @return The role of this object. Panel, ROWHEADER, COLUMNHEADER, TABLE, TABLE_CELL are supported. */ - virtual sal_Int16 SAL_CALL getAccessibleRole() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int16 SAL_CALL getAccessibleRole() override; /* Derived classes have to implement: - getAccessibleChildCount, @@ -166,34 +157,29 @@ public: /** @return TRUE, if the point lies within the bounding box of this object. */ - virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& rPoint ) - throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& rPoint ) override; /** @return The bounding box of this object. */ - virtual css::awt::Rectangle SAL_CALL getBounds() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::awt::Rectangle SAL_CALL getBounds() override; /** @return The upper left corner of the bounding box relative to the parent. */ - virtual css::awt::Point SAL_CALL getLocation() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::awt::Point SAL_CALL getLocation() override; /** @return The upper left corner of the bounding box in screen coordinates. */ - virtual css::awt::Point SAL_CALL getLocationOnScreen() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::awt::Point SAL_CALL getLocationOnScreen() override; /** @return The size of the bounding box. */ - virtual css::awt::Size SAL_CALL getSize() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::awt::Size SAL_CALL getSize() override; - virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getForeground( ) override; + virtual sal_Int32 SAL_CALL getBackground( ) override; // XFocusListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL focusGained( const css::awt::FocusEvent& e ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL focusLost( const css::awt::FocusEvent& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; + virtual void SAL_CALL focusGained( const css::awt::FocusEvent& e ) override; + virtual void SAL_CALL focusLost( const css::awt::FocusEvent& e ) override; /* Derived classes have to implement: - getAccessibleAt, @@ -202,36 +188,30 @@ public: /** @return The accessible child rendered under the given point. */ - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& rPoint ) - throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& rPoint ) override; // XAccessibleEventBroadcaster /** Adds a new event listener */ virtual void SAL_CALL addAccessibleEventListener( - const css::uno::Reference< css::accessibility::XAccessibleEventListener>& rxListener ) - throw ( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::accessibility::XAccessibleEventListener>& rxListener ) override; /** Removes an event listener. */ virtual void SAL_CALL removeAccessibleEventListener( - const css::uno::Reference< css::accessibility::XAccessibleEventListener>& rxListener ) - throw ( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::accessibility::XAccessibleEventListener>& rxListener ) override; // XTypeProvider /** @return An unique implementation ID. */ - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; // XServiceInfo /** @return Whether the specified service is supported by this class. */ - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) - throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override; /** @return A list of all supported services. */ - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; /* Derived classes have to implement: - getImplementationName. */ @@ -292,15 +272,13 @@ protected: @return The bounding box (VCL rect.) relative to the parent object. @throws css::lang::DisposedException */ - Rectangle getBoundingBox() - throw ( css::lang::DisposedException ); + Rectangle getBoundingBox(); /** Locks all mutex's and calculates the bounding box in screen coordinates. @return The bounding box (VCL rect.) in screen coordinates. @throws css::lang::DisposedException */ - Rectangle getBoundingBoxOnScreen() - throw ( css::lang::DisposedException ); + Rectangle getBoundingBoxOnScreen(); ::comphelper::AccessibleEventNotifier::TClientId getClientId() const { return m_aClientId; } void setClientId(::comphelper::AccessibleEventNotifier::TClientId _aNewClientId) { m_aClientId = _aNewClientId; } @@ -310,8 +288,7 @@ public: inline ::osl::Mutex& getMutex( ) { return m_aMutex; } /** @throws DisposedException If the object is not alive. */ - void ensureIsAlive() const - throw ( css::lang::DisposedException ); + void ensureIsAlive() const; protected: @@ -400,8 +377,7 @@ protected: // XAccessible /** @return The XAccessibleContext interface of this object. */ - virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext() override; }; diff --git a/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx index df7f6a4f2c2f..2bb3328a5acb 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxCheckBoxCell.hxx @@ -60,20 +60,20 @@ namespace accessibility DECLARE_XTYPEPROVIDER( ) // XAccessible - virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) override; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getImplementationName() throw ( css::uno::RuntimeException, std::exception ) override; - virtual ::sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual ::sal_Int32 SAL_CALL getAccessibleIndexInParent( ) override; // XAccessibleValue - virtual css::uno::Any SAL_CALL getCurrentValue( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getMaximumValue( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getMinimumValue( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getCurrentValue( ) override; + virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) override; + virtual css::uno::Any SAL_CALL getMaximumValue( ) override; + virtual css::uno::Any SAL_CALL getMinimumValue( ) override; // internal void SetChecked( bool _bChecked ); diff --git a/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx b/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx index c529875a7238..c81c836a4de8 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxHeaderBar.hxx @@ -60,121 +60,88 @@ public: The XAccessible interface of the specified child. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleChild( sal_Int32 nChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + getAccessibleChild( sal_Int32 nChildIndex ) override; /** @return The index of this object among the parent's children. */ virtual sal_Int32 SAL_CALL - getAccessibleIndexInParent() - throw ( css::uno::RuntimeException, std::exception ) override; + getAccessibleIndexInParent() override; // XAccessibleComponent /** @return The accessible child rendered under the given point. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleAtPoint( const css::awt::Point& rPoint ) - throw ( css::uno::RuntimeException, std::exception ) override; + getAccessibleAtPoint( const css::awt::Point& rPoint ) override; /** Grabs the focus to (the current cell of) the data table. */ - virtual void SAL_CALL grabFocus() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL grabFocus() override; // XAccessibleTable /** @return The description text of the specified row. */ virtual OUString SAL_CALL - getAccessibleRowDescription( sal_Int32 nRow ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + getAccessibleRowDescription( sal_Int32 nRow ) override; /** @return The description text of the specified column. */ - virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) override; /** @return The XAccessibleTable interface of the row header bar. */ virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL - getAccessibleRowHeaders() - throw ( css::uno::RuntimeException, std::exception ) override; + getAccessibleRowHeaders() override; /** @return The XAccessibleTable interface of the column header bar. */ virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL - getAccessibleColumnHeaders() - throw ( css::uno::RuntimeException, std::exception ) override; + getAccessibleColumnHeaders() override; /** @return An index list of completely selected rows. */ virtual css::uno::Sequence< sal_Int32 > SAL_CALL - getSelectedAccessibleRows() - throw ( css::uno::RuntimeException, std::exception ) override; + getSelectedAccessibleRows() override; /** @return An index list of completely selected columns. */ virtual css::uno::Sequence< sal_Int32 > SAL_CALL - getSelectedAccessibleColumns() - throw ( css::uno::RuntimeException, std::exception ) override; + getSelectedAccessibleColumns() override; /** @return TRUE, if the specified row is completely selected. */ - virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) override; /** @return TRUE, if the specified column is completely selected. */ - virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) override; /** @return The XAccessible interface of the cell object at the specified cell position. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) override; /** @return TRUE, if the specified cell is selected. */ - virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) override; // XAccessibleSelection /** Selects the specified child (row or column of the table). */ - virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override; /** @return TRUE, if the specified child (row/column) is selected. */ - virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override; /** Clears the complete selection. */ - virtual void SAL_CALL clearAccessibleSelection() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL clearAccessibleSelection() override; /** Selects all children or first, if multiselection is not supported. */ - virtual void SAL_CALL selectAllAccessibleChildren() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL selectAllAccessibleChildren() override; /** @return The number of selected rows/columns. */ - virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount() override; /** @return The specified selected row/column. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override; /** Removes the specified row/column from the selection. */ - virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override; // XInterface /** Queries for a new interface. */ - css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) - throw ( css::uno::RuntimeException, std::exception ) override; + css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override; /** Aquires the object (calls acquire() on base class). */ virtual void SAL_CALL acquire() throw () override; @@ -185,12 +152,10 @@ public: // XServiceInfo /** @return The name of this class. */ - virtual OUString SAL_CALL getImplementationName() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; /** @return An unique implementation ID. */ - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; protected: // internal virtual methods @@ -227,14 +192,12 @@ protected: @return The absolute child index from the index of selected children. @throws IndexOutOfBoundsException If the specified index is invalid. */ - sal_Int32 implGetChildIndexFromSelectedIndex( sal_Int32 nSelectedChildIndex ) - throw ( css::lang::IndexOutOfBoundsException ); + sal_Int32 implGetChildIndexFromSelectedIndex( sal_Int32 nSelectedChildIndex ); /** @attention This method requires locked mutex's and a living object. @throws IndexOutOfBoundsException If the specified row/column index (depending on type) is invalid. */ - void ensureIsValidHeaderIndex( sal_Int32 nIndex ) - throw ( css::lang::IndexOutOfBoundsException ); + void ensureIsValidHeaderIndex( sal_Int32 nIndex ); }; // inlines diff --git a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx index b616529c0b65..cfe00b40aa07 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxHeaderCell.hxx @@ -33,17 +33,17 @@ namespace accessibility const css::uno::Reference< css::awt::XWindow >& _xFocusWindow, ::svt::AccessibleBrowseBoxObjType _eObjType); /** @return The count of visible children. */ - virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; /** @return The XAccessible interface of the specified child. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleChild( sal_Int32 nChildIndex ) throw ( css::lang::IndexOutOfBoundsException,css::uno::RuntimeException, std::exception ) override; + getAccessibleChild( sal_Int32 nChildIndex ) override; /** @return The index of this object among the parent's children. */ - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override; /** Grabs the focus to the BrowseBox. */ - virtual void SAL_CALL grabFocus() throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL grabFocus() override; inline bool isRowBarCell() const { @@ -53,7 +53,7 @@ namespace accessibility /** @return The name of this class. */ - virtual OUString SAL_CALL getImplementationName() throw ( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; /** Creates a new AccessibleStateSetHelper and fills it with states of the current object. diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx index c4a3f01939ee..a6735dcdffcc 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxTable.hxx @@ -45,84 +45,62 @@ public: /** @return The XAccessible interface of the specified child. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleChild( sal_Int32 nChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + getAccessibleChild( sal_Int32 nChildIndex ) override; /** @return The index of this object among the parent's children. */ - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override; // XAccessibleComponent /** @return The accessible child rendered under the given point. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleAtPoint( const css::awt::Point& rPoint ) - throw ( css::uno::RuntimeException, std::exception ) override; + getAccessibleAtPoint( const css::awt::Point& rPoint ) override; /** Grabs the focus to (the current cell of) the data table. */ - virtual void SAL_CALL grabFocus() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL grabFocus() override; // XAccessibleTable /** @return The description text of the specified row. */ - virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) override; /** @return The description text of the specified column. */ - virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) override; /** @return The XAccessibleTable interface of the row header bar. */ virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL - getAccessibleRowHeaders() - throw ( css::uno::RuntimeException, std::exception ) override; + getAccessibleRowHeaders() override; /** @return The XAccessibleTable interface of the column header bar. */ virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL - getAccessibleColumnHeaders() - throw ( css::uno::RuntimeException, std::exception ) override; + getAccessibleColumnHeaders() override; /** @return An index list of completely selected rows. */ virtual css::uno::Sequence< sal_Int32 > SAL_CALL - getSelectedAccessibleRows() - throw ( css::uno::RuntimeException, std::exception ) override; + getSelectedAccessibleRows() override; /** @return An index list of completely selected columns. */ virtual css::uno::Sequence< sal_Int32 > SAL_CALL - getSelectedAccessibleColumns() - throw ( css::uno::RuntimeException, std::exception ) override; + getSelectedAccessibleColumns() override; /** @return TRUE, if the specified row is completely selected. */ - virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) override; /** @return TRUE, if the specified column is completely selected. */ - virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) override; /** @return The XAccessible interface of the cell object at the specified cell position. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) override; /** @return TRUE, if the specified cell is selected. */ - virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) override; // XServiceInfo /** @return The name of this class. */ - virtual OUString SAL_CALL getImplementationName() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; protected: // internal virtual methods @@ -141,8 +119,7 @@ protected: @throws css::uno::RuntimeException */ css::uno::Reference< css::accessibility::XAccessibleTable > - implGetHeaderBar( sal_Int32 nChildIndex ) - throw ( css::uno::RuntimeException ); + implGetHeaderBar( sal_Int32 nChildIndex ); }; diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx index 6d0ff563271f..8b28ae8acf98 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxTableBase.hxx @@ -60,12 +60,10 @@ public: // XAccessibleContext /** @return The count of visible children. */ - virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; /** @return The role of this object (a table). */ - virtual sal_Int16 SAL_CALL getAccessibleRole() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int16 SAL_CALL getAccessibleRole() override; /* Derived classes have to implement: - getAccessibleChild, @@ -80,51 +78,37 @@ public: // XAccessibleTable /** @return The number of used rows in the table (0 = empty table). */ - virtual sal_Int32 SAL_CALL getAccessibleRowCount() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getAccessibleRowCount() override; /** @return The number of used columns in the table (0 = empty table). */ - virtual sal_Int32 SAL_CALL getAccessibleColumnCount() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getAccessibleColumnCount() override; /** @return The row extent of the specified cell (always 1). */ virtual sal_Int32 SAL_CALL - getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) override; /** @return The column extent of the specified cell (always 1). */ virtual sal_Int32 SAL_CALL - getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) override; /** @return The caption cell of the table (not supported). */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleCaption() - throw ( css::uno::RuntimeException, std::exception ) override; + getAccessibleCaption() override; /** @return The summary object of the table (not supported). */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleSummary() - throw ( css::uno::RuntimeException, std::exception ) override; + getAccessibleSummary() override; /** @return The child index of the specified cell. */ - virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) override; /** @return The row index of the specified child cell. */ - virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) override; /** @return The column index of the specified child cell. */ - virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) override; /* Derived classes have to implement: - getAccessibleRowDescription, @@ -141,8 +125,7 @@ public: // XInterface /** Queries for a new interface. */ - css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) - throw ( css::uno::RuntimeException, std::exception ) override; + css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override; /** Aquires the object (calls acquire() on base class). */ virtual void SAL_CALL acquire() throw () override; @@ -153,12 +136,10 @@ public: // XTypeProvider /** @return A sequence of possible types (received from base classes). */ - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; /** @return An unique implementation ID. */ - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; // XServiceInfo @@ -236,23 +217,19 @@ protected: /** @attention This method requires locked mutex's and a living object. @throws IndexOutOfBoundsException If the specified row index is invalid. */ - void ensureIsValidRow( sal_Int32 nRow ) - throw ( css::lang::IndexOutOfBoundsException ); + void ensureIsValidRow( sal_Int32 nRow ); /** @attention This method requires locked mutex's and a living object. @throws IndexOutOfBoundsException If the specified column index is invalid. */ - void ensureIsValidColumn( sal_Int32 nColumn ) - throw ( css::lang::IndexOutOfBoundsException ); + void ensureIsValidColumn( sal_Int32 nColumn ); /** @attention This method requires locked mutex's and a living object. @throws IndexOutOfBoundsException If the specified cell address is invalid. */ - void ensureIsValidAddress( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( css::lang::IndexOutOfBoundsException ); + void ensureIsValidAddress( sal_Int32 nRow, sal_Int32 nColumn ); /** @attention This method requires locked mutex's and a living object. @throws IndexOutOfBoundsException If the specified child index is invalid. */ - void ensureIsValidIndex( sal_Int32 nChildIndex ) - throw ( css::lang::IndexOutOfBoundsException ); + void ensureIsValidIndex( sal_Int32 nChildIndex ); }; diff --git a/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx b/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx index 0fb9388ed61c..dbd0aa0e6e99 100644 --- a/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx +++ b/accessibility/inc/extended/AccessibleBrowseBoxTableCell.hxx @@ -56,8 +56,7 @@ namespace accessibility // XInterface ------------------------------------------------------------- /** Queries for a new interface. */ - css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) - throw ( css::uno::RuntimeException, std::exception ) override; + css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override; /** Aquires the object (calls acquire() on base class). */ virtual void SAL_CALL acquire() throw () override; @@ -67,32 +66,26 @@ namespace accessibility // XEventListener using AccessibleBrowseBoxBase::disposing; - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) - throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; /** @return The index of this object among the parent's children. */ - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override; /** @return The name of this class. */ - virtual OUString SAL_CALL getImplementationName() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; /** @return The count of visible children. */ - virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; /** @return The XAccessible interface of the specified child. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleChild( sal_Int32 nChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + getAccessibleChild( sal_Int32 nChildIndex ) override; /** Creates a new AccessibleStateSetHelper and fills it with states of the current object. @@ -105,27 +98,26 @@ namespace accessibility /** @return The XAccessibleContext interface of this object. */ virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL - getAccessibleContext() - throw ( css::uno::RuntimeException, std::exception ) override; + getAccessibleContext() override; // XAccessibleText - virtual sal_Int32 SAL_CALL getCaretPosition() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getCharacterCount() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSelectedText() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSelectionStart() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSelectionEnd() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCaretPosition() override; + virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override; + virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override; + virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) override; + virtual sal_Int32 SAL_CALL getCharacterCount() override; + virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) override; + virtual OUString SAL_CALL getSelectedText() override; + virtual sal_Int32 SAL_CALL getSelectionStart() override; + virtual sal_Int32 SAL_CALL getSelectionEnd() override; + virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual OUString SAL_CALL getText() override; + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override; + virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override; + virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override; + virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; }; } #endif // INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEBROWSEBOXTABLECELL_HXX diff --git a/accessibility/inc/extended/AccessibleGridControl.hxx b/accessibility/inc/extended/AccessibleGridControl.hxx index 703ea09a5cce..b55523d39d23 100644 --- a/accessibility/inc/extended/AccessibleGridControl.hxx +++ b/accessibility/inc/extended/AccessibleGridControl.hxx @@ -54,18 +54,14 @@ protected: // XAccessibleContext ----------------------------------------------------- /** @return The count of visible children. */ - virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; /** @return The XAccessible interface of the specified child. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleChild( sal_Int32 nChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + getAccessibleChild( sal_Int32 nChildIndex ) override; /** @return The role of this object (a table). */ - virtual sal_Int16 SAL_CALL getAccessibleRole() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int16 SAL_CALL getAccessibleRole() override; // XAccessibleComponent --------------------------------------------------- @@ -73,20 +69,17 @@ protected: The accessible child rendered under the given point. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleAtPoint( const css::awt::Point& rPoint ) - throw ( css::uno::RuntimeException, std::exception ) override; + getAccessibleAtPoint( const css::awt::Point& rPoint ) override; /** Grabs the focus to the Grid Control. */ - virtual void SAL_CALL grabFocus() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL grabFocus() override; // XServiceInfo ----------------------------------------------------------- /** @return The name of this class. */ - virtual OUString SAL_CALL getImplementationName() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; public: // helper functions @@ -182,7 +175,7 @@ protected: // XAccessible virtual css::uno::Reference< css::accessibility::XAccessibleContext > - SAL_CALL getAccessibleContext() throw ( css::uno::RuntimeException, std::exception ) override; + SAL_CALL getAccessibleContext() override; // IAccessibleTable virtual css::uno::Reference< css::accessibility::XAccessible > diff --git a/accessibility/inc/extended/AccessibleGridControlBase.hxx b/accessibility/inc/extended/AccessibleGridControlBase.hxx index 3776fb4a0037..3c8dd7cbb11e 100644 --- a/accessibility/inc/extended/AccessibleGridControlBase.hxx +++ b/accessibility/inc/extended/AccessibleGridControlBase.hxx @@ -87,47 +87,38 @@ public: /** @return A reference to the parent accessible object. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleParent() - throw ( css::uno::RuntimeException, std::exception ) override; + getAccessibleParent() override; /** @return The index of this object among the parent's children. */ - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override; /** @return The description of this object. */ - virtual OUString SAL_CALL getAccessibleDescription() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getAccessibleDescription() override; /** @return The name of this object. */ - virtual OUString SAL_CALL getAccessibleName() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getAccessibleName() override; /** @return The relation set (the GridControl does not have one). */ virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL - getAccessibleRelationSet() - throw ( css::uno::RuntimeException, std::exception ) override; + getAccessibleRelationSet() override; /** @return The set of current states. */ virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL - getAccessibleStateSet() - throw ( css::uno::RuntimeException, std::exception ) override; + getAccessibleStateSet() override; /** @return The parent's locale. */ - virtual css::lang::Locale SAL_CALL getLocale() - throw ( css::accessibility::IllegalAccessibleComponentStateException, - css::uno::RuntimeException, std::exception ) override; + virtual css::lang::Locale SAL_CALL getLocale() override; /** @return The role of this object. Panel, ROWHEADER, COLUMNHEADER, TABLE, TABLE_CELL are supported. */ - virtual sal_Int16 SAL_CALL getAccessibleRole() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int16 SAL_CALL getAccessibleRole() override; /* Derived classes have to implement: - getAccessibleChildCount, @@ -140,29 +131,24 @@ public: /** @return TRUE, if the point lies within the bounding box of this object. */ - virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& rPoint ) - throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& rPoint ) override; /** @return The bounding box of this object. */ - virtual css::awt::Rectangle SAL_CALL getBounds() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::awt::Rectangle SAL_CALL getBounds() override; /** @return The upper left corner of the bounding box relative to the parent. */ - virtual css::awt::Point SAL_CALL getLocation() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::awt::Point SAL_CALL getLocation() override; /** @return The upper left corner of the bounding box in screen coordinates. */ - virtual css::awt::Point SAL_CALL getLocationOnScreen() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::awt::Point SAL_CALL getLocationOnScreen() override; /** @return The size of the bounding box. */ - virtual css::awt::Size SAL_CALL getSize() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::awt::Size SAL_CALL getSize() override; - virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getForeground( ) override; + virtual sal_Int32 SAL_CALL getBackground( ) override; /* Derived classes have to implement: @@ -173,37 +159,31 @@ public: The accessible child rendered under the given point. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleAtPoint( const css::awt::Point& rPoint ) - throw ( css::uno::RuntimeException, std::exception ) override; + getAccessibleAtPoint( const css::awt::Point& rPoint ) override; // XAccessibleEventBroadcaster /** Adds a new event listener */ virtual void SAL_CALL addAccessibleEventListener( - const css::uno::Reference< css::accessibility::XAccessibleEventListener>& rxListener ) - throw ( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::accessibility::XAccessibleEventListener>& rxListener ) override; /** Removes an event listener. */ virtual void SAL_CALL removeAccessibleEventListener( - const css::uno::Reference< css::accessibility::XAccessibleEventListener>& rxListener ) - throw ( css::uno::RuntimeException, std::exception ) override; + const css::uno::Reference< css::accessibility::XAccessibleEventListener>& rxListener ) override; // XTypeProvider /** @return An unique implementation ID. */ - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; // XServiceInfo /** @return Whether the specified service is supported by this class. */ - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) - throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override; /** @return A list of all supported services. */ virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw ( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; /* Derived classes have to implement: - getImplementationName. */ @@ -251,8 +231,7 @@ protected: // internal helper methods /** @throws DisposedException If the object is not alive. */ - void ensureIsAlive() const - throw ( css::lang::DisposedException ); + void ensureIsAlive() const; /** Changes the name of the object (flat assignment, no notify). @attention This method requires a locked mutex. */ @@ -263,14 +242,12 @@ protected: @return The bounding box (VCL rect.) relative to the parent object. @throws css::lang::DisposedException */ - Rectangle getBoundingBox() - throw ( css::lang::DisposedException ); + Rectangle getBoundingBox(); ///** Locks all mutex's and calculates the bounding box in screen // coordinates. // @return The bounding box (VCL rect.) in screen coordinates. */ /// @throws css::lang::DisposedException - Rectangle getBoundingBoxOnScreen() - throw ( css::lang::DisposedException ); + Rectangle getBoundingBoxOnScreen(); ::comphelper::AccessibleEventNotifier::TClientId getClientId() const { return m_aClientId; } void setClientId(::comphelper::AccessibleEventNotifier::TClientId _aNewClientId) { m_aClientId = _aNewClientId; } @@ -330,8 +307,7 @@ protected: /** @return The XAccessibleContext interface of this object. */ virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL - getAccessibleContext() - throw ( css::uno::RuntimeException, std::exception ) override; + getAccessibleContext() override; private: GridControlAccessibleElement( const GridControlAccessibleElement& ) = delete; diff --git a/accessibility/inc/extended/AccessibleGridControlHeader.hxx b/accessibility/inc/extended/AccessibleGridControlHeader.hxx index 49641b60dab0..439941a67a55 100644 --- a/accessibility/inc/extended/AccessibleGridControlHeader.hxx +++ b/accessibility/inc/extended/AccessibleGridControlHeader.hxx @@ -53,90 +53,67 @@ public: The XAccessible interface of the specified child. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleChild( sal_Int32 nChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + getAccessibleChild( sal_Int32 nChildIndex ) override; /** @return The index of this object among the parent's children. */ - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override; // XAccessibleComponent /** @return The accessible child rendered under the given point. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleAtPoint( const css::awt::Point& rPoint ) - throw ( css::uno::RuntimeException, std::exception ) override; + getAccessibleAtPoint( const css::awt::Point& rPoint ) override; /** Grabs the focus to (the current cell of) the data table. */ - virtual void SAL_CALL grabFocus() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL grabFocus() override; // XAccessibleTable /** @return The description text of the specified row. */ virtual OUString SAL_CALL - getAccessibleRowDescription( sal_Int32 nRow ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + getAccessibleRowDescription( sal_Int32 nRow ) override; /** @return The description text of the specified column. */ virtual OUString SAL_CALL - getAccessibleColumnDescription( sal_Int32 nColumn ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + getAccessibleColumnDescription( sal_Int32 nColumn ) override; /** @return The XAccessibleTable interface of the row header bar. */ virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL - getAccessibleRowHeaders() - throw ( css::uno::RuntimeException, std::exception ) override; + getAccessibleRowHeaders() override; /** @return The XAccessibleTable interface of the column header bar. */ virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL - getAccessibleColumnHeaders() - throw ( css::uno::RuntimeException, std::exception ) override; + getAccessibleColumnHeaders() override; /** @return An index list of completely selected rows. */ virtual css::uno::Sequence< sal_Int32 > SAL_CALL - getSelectedAccessibleRows() - throw ( css::uno::RuntimeException, std::exception ) override; + getSelectedAccessibleRows() override; /** @return An index list of completely selected columns. */ virtual css::uno::Sequence< sal_Int32 > SAL_CALL - getSelectedAccessibleColumns() - throw ( css::uno::RuntimeException, std::exception ) override; + getSelectedAccessibleColumns() override; /** @return TRUE, if the specified row is completely selected. */ - virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) override; /** @return TRUE, if the specified column is completely selected. */ - virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) override; /** @return The XAccessible interface of the cell object at the specified cell position. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) override; /** @return TRUE, if the specified cell is selected. */ - virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) override; // XServiceInfo /** @return The name of this class. */ - virtual OUString SAL_CALL getImplementationName() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; /** @return An unique implementation ID. */ - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; protected: /** Returns the specified row or column. Uses one of the parameters, diff --git a/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx b/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx index 82272a000ad4..bece5123ad85 100644 --- a/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx +++ b/accessibility/inc/extended/AccessibleGridControlHeaderCell.hxx @@ -32,23 +32,22 @@ namespace accessibility ::svt::table::IAccessibleTable& _rTable, ::svt::table::AccessibleTableControlObjType _eObjType); /** @return The count of visible children. */ - virtual sal_Int32 SAL_CALL getAccessibleChildCount() throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; /** @return The XAccessible interface of the specified child. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleChild( sal_Int32 nChildIndex ) throw ( css::lang::IndexOutOfBoundsException,css::uno::RuntimeException, std::exception ) override; + getAccessibleChild( sal_Int32 nChildIndex ) override; /** @return The index of this object among the parent's children. */ - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override; /** Grabs the focus to the GridControl. */ - virtual void SAL_CALL grabFocus() throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL grabFocus() override; // XInterface /** Queries for a new interface. */ - css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) - throw ( css::uno::RuntimeException, std::exception ) override; + css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override; /** Aquires the object (calls acquire() on base class). */ virtual void SAL_CALL acquire() throw () override; @@ -59,13 +58,12 @@ namespace accessibility /** @return The XAccessibleContext interface of this object. */ virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL - getAccessibleContext() - throw ( css::uno::RuntimeException, std::exception ) override; + getAccessibleContext() override; /** @return The name of this class. */ - virtual OUString SAL_CALL getImplementationName() throw ( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; /** Creates a new AccessibleStateSetHelper and fills it with states of the current object. diff --git a/accessibility/inc/extended/AccessibleGridControlTable.hxx b/accessibility/inc/extended/AccessibleGridControlTable.hxx index ab88c0284a5e..df91b96c664e 100644 --- a/accessibility/inc/extended/AccessibleGridControlTable.hxx +++ b/accessibility/inc/extended/AccessibleGridControlTable.hxx @@ -52,118 +52,85 @@ public: /** @return The XAccessible interface of the specified child. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleChild( sal_Int32 nChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + getAccessibleChild( sal_Int32 nChildIndex ) override; /** @return The index of this object among the parent's children. */ - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override; // XAccessibleComponent /** @return The accessible child rendered under the given point. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleAtPoint( const css::awt::Point& rPoint ) - throw ( css::uno::RuntimeException, std::exception ) override; + getAccessibleAtPoint( const css::awt::Point& rPoint ) override; /** Grabs the focus to (the current cell of) the data table. */ - virtual void SAL_CALL grabFocus() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL grabFocus() override; // XAccessibleTable /** @return The description text of the specified row. */ - virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getAccessibleRowDescription( sal_Int32 nRow ) override; /** @return The description text of the specified column. */ - virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getAccessibleColumnDescription( sal_Int32 nColumn ) override; /** @return The XAccessibleTable interface of the row header bar. */ virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL - getAccessibleRowHeaders() - throw ( css::uno::RuntimeException, std::exception ) override; + getAccessibleRowHeaders() override; /** @return The XAccessibleTable interface of the column header bar. */ virtual css::uno::Reference< css::accessibility::XAccessibleTable > SAL_CALL - getAccessibleColumnHeaders() - throw ( css::uno::RuntimeException, std::exception ) override; + getAccessibleColumnHeaders() override; /** @return An index list of completely selected rows. */ virtual css::uno::Sequence< sal_Int32 > SAL_CALL - getSelectedAccessibleRows() - throw ( css::uno::RuntimeException, std::exception ) override; + getSelectedAccessibleRows() override; /** @return An index list of completely selected columns. */ virtual css::uno::Sequence< sal_Int32 > SAL_CALL - getSelectedAccessibleColumns() - throw ( css::uno::RuntimeException, std::exception ) override; + getSelectedAccessibleColumns() override; /** @return TRUE, if the specified row is completely selected. */ - virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL isAccessibleRowSelected( sal_Int32 nRow ) override; /** @return TRUE, if the specified column is completely selected. */ - virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL isAccessibleColumnSelected( sal_Int32 nColumn ) override; /** @return The XAccessible interface of the cell object at the specified cell position. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) override; /** @return TRUE, if the specified cell is selected. */ - virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) override; // XAccessibleSelection /** Selects the specified child (row or column of the table). */ - virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override; /** @return TRUE, if the specified child (row/column) is selected. */ - virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override; /** Clears the complete selection. */ - virtual void SAL_CALL clearAccessibleSelection() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL clearAccessibleSelection() override; /** Selects all children or first, if multiselection is not supported. */ - virtual void SAL_CALL selectAllAccessibleChildren() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL selectAllAccessibleChildren() override; /** @return The number of selected rows/columns. */ - virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount() override; /** @return The specified selected row/column. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override; /** Removes the specified row/column from the selection. */ - virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override; // XInterface /** Queries for a new interface. */ - css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) - throw ( css::uno::RuntimeException, std::exception ) override; + css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override; /** Aquires the object (calls acquire() on base class). */ virtual void SAL_CALL acquire() throw () override; @@ -173,8 +140,7 @@ public: // XServiceInfo /** @return The name of this class. */ - virtual OUString SAL_CALL getImplementationName() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; /**@return m_pCellVector*/ std::vector< AccessibleGridControlTableCell* >& getCellVector() { return m_pCellVector;} @@ -197,8 +163,7 @@ protected: // @return The XAccessibleTable interface of the specified header bar. */ /// @throws css::uno::RuntimeException css::uno::Reference< css::accessibility::XAccessibleTable > - implGetHeaderBar( sal_Int32 nChildIndex ) - throw ( css::uno::RuntimeException ); + implGetHeaderBar( sal_Int32 nChildIndex ); }; diff --git a/accessibility/inc/extended/AccessibleGridControlTableBase.hxx b/accessibility/inc/extended/AccessibleGridControlTableBase.hxx index 9276247f3a5a..051e99b1da96 100644 --- a/accessibility/inc/extended/AccessibleGridControlTableBase.hxx +++ b/accessibility/inc/extended/AccessibleGridControlTableBase.hxx @@ -56,12 +56,10 @@ public: // XAccessibleContext /** @return The count of visible children. */ - virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; /** @return The role of this object (a table). */ - virtual sal_Int16 SAL_CALL getAccessibleRole() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int16 SAL_CALL getAccessibleRole() override; /* Derived classes have to implement: - getAccessibleChild, @@ -76,49 +74,35 @@ public: // XAccessibleTable /** @return The number of used rows in the table (0 = empty table). */ - virtual sal_Int32 SAL_CALL getAccessibleRowCount() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getAccessibleRowCount() override; /** @return The number of used columns in the table (0 = empty table). */ - virtual sal_Int32 SAL_CALL getAccessibleColumnCount() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getAccessibleColumnCount() override; /** @return The row extent of the specified cell (always 1). */ virtual sal_Int32 SAL_CALL - getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) override; /** @return The column extent of the specified cell (always 1). */ virtual sal_Int32 SAL_CALL - getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) override; /** @return The caption cell of the table (not supported). */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleCaption() - throw ( css::uno::RuntimeException, std::exception ) override; + getAccessibleCaption() override; /** @return The summary object of the table (not supported). */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleSummary() - throw ( css::uno::RuntimeException, std::exception ) override; + getAccessibleSummary() override; /** @return The child index of the specified cell. */ - virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) override; /** @return The row index of the specified child cell. */ - virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getAccessibleRow( sal_Int32 nChildIndex ) override; /** @return The column index of the specified child cell. */ - virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getAccessibleColumn( sal_Int32 nChildIndex ) override; /* Derived classes have to implement: - getAccessibleRowDescription, @@ -135,8 +119,7 @@ public: // XInterface /** Queries for a new interface. */ - css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) - throw ( css::uno::RuntimeException, std::exception ) override; + css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override; /** Aquires the object (calls acquire() on base class). */ virtual void SAL_CALL acquire() throw () override; @@ -147,12 +130,10 @@ public: // XTypeProvider /** @return A sequence of possible types (received from base classes). */ - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; /** @return An unique implementation ID. */ - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; protected: // internal helper methods @@ -172,23 +153,19 @@ protected: /** @attention This method requires locked mutex's and a living object. @throws IndexOutOfBoundsException If the specified row index is invalid. */ - void ensureIsValidRow( sal_Int32 nRow ) - throw ( css::lang::IndexOutOfBoundsException ); + void ensureIsValidRow( sal_Int32 nRow ); /** @attention This method requires locked mutex's and a living object. @throws IndexOutOfBoundsException If the specified column index is invalid. */ - void ensureIsValidColumn( sal_Int32 nColumn ) - throw ( css::lang::IndexOutOfBoundsException ); + void ensureIsValidColumn( sal_Int32 nColumn ); /** @attention This method requires locked mutex's and a living object. @throws IndexOutOfBoundsException If the specified cell address is invalid. */ - void ensureIsValidAddress( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( css::lang::IndexOutOfBoundsException ); + void ensureIsValidAddress( sal_Int32 nRow, sal_Int32 nColumn ); /** @attention This method requires locked mutex's and a living object. @throws IndexOutOfBoundsException If the specified child index is invalid. */ - void ensureIsValidIndex( sal_Int32 nChildIndex ) - throw ( css::lang::IndexOutOfBoundsException ); + void ensureIsValidIndex( sal_Int32 nChildIndex ); }; diff --git a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx index 6edf28c07560..e3d138f1eaff 100644 --- a/accessibility/inc/extended/AccessibleGridControlTableCell.hxx +++ b/accessibility/inc/extended/AccessibleGridControlTableCell.hxx @@ -38,7 +38,7 @@ namespace accessibility inline sal_Int32 getColumnPos( ) const { return m_nColPos; } // XAccessibleComponent - virtual void SAL_CALL grabFocus() throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL grabFocus() override; protected: AccessibleGridControlCell( @@ -81,8 +81,7 @@ namespace accessibility // XInterface ------------------------------------------------------------- /** Queries for a new interface. */ - css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) - throw ( css::uno::RuntimeException, std::exception ) override; + css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override; /** Aquires the object (calls acquire() on base class). */ virtual void SAL_CALL acquire() throw () override; @@ -91,28 +90,23 @@ namespace accessibility virtual void SAL_CALL release() throw () override; /** @return The index of this object among the parent's children. */ - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override; /** @return The name of this class. */ - virtual OUString SAL_CALL getImplementationName() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; /** @return The count of visible children. */ - virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; /** @return The XAccessible interface of the specified child. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleChild( sal_Int32 nChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + getAccessibleChild( sal_Int32 nChildIndex ) override; /** Creates a new AccessibleStateSetHelper and fills it with states of the current object. @@ -125,27 +119,26 @@ namespace accessibility /** @return The XAccessibleContext interface of this object. */ virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL - getAccessibleContext() - throw ( css::uno::RuntimeException, std::exception ) override; + getAccessibleContext() override; // XAccessibleText - virtual sal_Int32 SAL_CALL getCaretPosition() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getCharacterCount() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSelectedText() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSelectionStart() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSelectionEnd() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCaretPosition() override; + virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override; + virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override; + virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) override; + virtual sal_Int32 SAL_CALL getCharacterCount() override; + virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) override; + virtual OUString SAL_CALL getSelectedText() override; + virtual sal_Int32 SAL_CALL getSelectionStart() override; + virtual sal_Int32 SAL_CALL getSelectionEnd() override; + virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual OUString SAL_CALL getText() override; + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override; + virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override; + virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override; + virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; }; } #endif // INCLUDED_ACCESSIBILITY_INC_EXTENDED_ACCESSIBLEGRIDCONTROLTABLECELL_HXX diff --git a/accessibility/inc/extended/accessiblebrowseboxcell.hxx b/accessibility/inc/extended/accessiblebrowseboxcell.hxx index 53415c1dcc80..113e38f752df 100644 --- a/accessibility/inc/extended/accessiblebrowseboxcell.hxx +++ b/accessibility/inc/extended/accessiblebrowseboxcell.hxx @@ -49,7 +49,7 @@ namespace accessibility virtual Rectangle implGetBoundingBoxOnScreen() override; // XAccessibleComponent - virtual void SAL_CALL grabFocus() throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL grabFocus() override; protected: AccessibleBrowseBoxCell( diff --git a/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx b/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx index 7082ee06c0d4..d81f4e65ae01 100644 --- a/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx +++ b/accessibility/inc/extended/accessibleeditbrowseboxcell.hxx @@ -52,11 +52,11 @@ namespace accessibility protected: // XAccessibleComponent - virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) override ; - virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) override ; + virtual sal_Int32 SAL_CALL getForeground( ) override ; + virtual sal_Int32 SAL_CALL getBackground( ) override ; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw ( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; // XInterface DECLARE_XINTERFACE( ) @@ -64,27 +64,27 @@ namespace accessibility DECLARE_XTYPEPROVIDER( ) // XAccessibleContext - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) override; + virtual OUString SAL_CALL getAccessibleDescription( ) override; + virtual OUString SAL_CALL getAccessibleName( ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) override; - sal_Int16 SAL_CALL getAccessibleRole() throw ( css::uno::RuntimeException, std::exception ) override; + sal_Int16 SAL_CALL getAccessibleRole() override; - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override; - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; protected: // OComponentHelper virtual void SAL_CALL disposing() override; // XComponent/OComponentProxyAggregationHelper (needs to be disambiguated) - virtual void SAL_CALL dispose() throw( css::uno::RuntimeException, std::exception ) final override; + virtual void SAL_CALL dispose() final override; // OAccessibleContextWrapperHelper(); - void notifyTranslatedEvent( const css::accessibility::AccessibleEventObject& _rEvent ) throw (css::uno::RuntimeException) override; + void notifyTranslatedEvent( const css::accessibility::AccessibleEventObject& _rEvent ) override; private: EditBrowseBoxTableCell( const EditBrowseBoxTableCell& ) = delete; @@ -126,7 +126,7 @@ namespace accessibility virtual ~EditBrowseBoxTableCellAccess() override; // XAccessible - virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) override; // XComponent/OComponentHelper virtual void SAL_CALL disposing() override; diff --git a/accessibility/inc/extended/accessibleiconchoicectrl.hxx b/accessibility/inc/extended/accessibleiconchoicectrl.hxx index 8b54e3058a86..3d83f7762bf9 100644 --- a/accessibility/inc/extended/accessibleiconchoicectrl.hxx +++ b/accessibility/inc/extended/accessibleiconchoicectrl.hxx @@ -71,30 +71,29 @@ namespace accessibility DECLARE_XINTERFACE() // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XAccessible - virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) override; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) override; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) override; + virtual OUString SAL_CALL getAccessibleDescription( ) override; + virtual OUString SAL_CALL getAccessibleName( ) override; // XAccessibleSelection - void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - void SAL_CALL clearAccessibleSelection( ) throw (css::uno::RuntimeException, std::exception) override; - void SAL_CALL selectAllAccessibleChildren( ) throw (css::uno::RuntimeException, std::exception) override; - sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; - css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override; + sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override; + void SAL_CALL clearAccessibleSelection( ) override; + void SAL_CALL selectAllAccessibleChildren( ) override; + sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) override; + css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override; + void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override; }; diff --git a/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx b/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx index 6217ea70f43b..fb020db028b5 100644 --- a/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx +++ b/accessibility/inc/extended/accessibleiconchoicectrlentry.hxx @@ -80,16 +80,12 @@ namespace accessibility /// @throws css::lang::DisposedException /// @throws css::uno::RuntimeException - Rectangle GetBoundingBox() - throw (css::lang::DisposedException, - css::uno::RuntimeException); + Rectangle GetBoundingBox(); /// @throws css::lang::DisposedException /// @throws css::uno::RuntimeException - Rectangle GetBoundingBoxOnScreen() - throw (css::lang::DisposedException, - css::uno::RuntimeException); + Rectangle GetBoundingBoxOnScreen(); /// @throws css::lang::DisposedException - void EnsureIsAlive() const throw ( css::lang::DisposedException ); + void EnsureIsAlive() const; protected: virtual ~AccessibleIconChoiceCtrlEntry() override; @@ -116,71 +112,70 @@ namespace accessibility const css::uno::Reference< css::accessibility::XAccessible >& _xParent ); // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; // XAccessible - virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) override; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::lang::Locale SAL_CALL getLocale( ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) override; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) override; + virtual OUString SAL_CALL getAccessibleDescription( ) override; + virtual OUString SAL_CALL getAccessibleName( ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) override; + virtual css::lang::Locale SAL_CALL getLocale( ) override; // XAccessibleComponent - virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Rectangle SAL_CALL getBounds( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Point SAL_CALL getLocation( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Point SAL_CALL getLocationOnScreen( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Size SAL_CALL getSize( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grabFocus( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override; + virtual css::awt::Rectangle SAL_CALL getBounds( ) override; + virtual css::awt::Point SAL_CALL getLocation( ) override; + virtual css::awt::Point SAL_CALL getLocationOnScreen( ) override; + virtual css::awt::Size SAL_CALL getSize( ) override; + virtual void SAL_CALL grabFocus( ) override; + virtual sal_Int32 SAL_CALL getForeground( ) override; + virtual sal_Int32 SAL_CALL getBackground( ) override; // XAccessibleText - virtual sal_Int32 SAL_CALL getCaretPosition() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getCharacterCount() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSelectedText() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSelectionStart() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSelectionEnd() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCaretPosition() override; + virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override; + virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override; + virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) override; + virtual sal_Int32 SAL_CALL getCharacterCount() override; + virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) override; + virtual OUString SAL_CALL getSelectedText() override; + virtual sal_Int32 SAL_CALL getSelectionStart() override; + virtual sal_Int32 SAL_CALL getSelectionEnd() override; + virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual OUString SAL_CALL getText() override; + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override; + virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override; + virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override; + virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; // XAccessibleEventBroadcaster - virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override; + virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override; // XAccessibleAction - virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleActionDescription( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) override; + virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex ) override; + virtual OUString SAL_CALL getAccessibleActionDescription( sal_Int32 nIndex ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) override; }; diff --git a/accessibility/inc/extended/accessiblelistbox.hxx b/accessibility/inc/extended/accessiblelistbox.hxx index e8249be5d20a..924eb9347d15 100644 --- a/accessibility/inc/extended/accessiblelistbox.hxx +++ b/accessibility/inc/extended/accessiblelistbox.hxx @@ -84,30 +84,29 @@ namespace accessibility DECLARE_XINTERFACE() // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XAccessible - virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) override; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) override; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) override; + virtual OUString SAL_CALL getAccessibleDescription( ) override; + virtual OUString SAL_CALL getAccessibleName( ) override; // XAccessibleSelection - void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - void SAL_CALL clearAccessibleSelection( ) throw (css::uno::RuntimeException, std::exception) override; - void SAL_CALL selectAllAccessibleChildren( ) throw (css::uno::RuntimeException, std::exception) override; - sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; - css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override; + sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override; + void SAL_CALL clearAccessibleSelection( ) override; + void SAL_CALL selectAllAccessibleChildren( ) override; + sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) override; + css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override; + void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override; private: diff --git a/accessibility/inc/extended/accessiblelistboxentry.hxx b/accessibility/inc/extended/accessiblelistboxentry.hxx index 7b0a49538131..8c233ec3025d 100644 --- a/accessibility/inc/extended/accessiblelistboxentry.hxx +++ b/accessibility/inc/extended/accessiblelistboxentry.hxx @@ -96,16 +96,12 @@ namespace accessibility /// @throws css::lang::DisposedException /// @throws css::uno::RuntimeException - Rectangle GetBoundingBox() - throw (css::lang::DisposedException, - css::uno::RuntimeException); + Rectangle GetBoundingBox(); /// @throws css::lang::DisposedException /// @throws css::uno::RuntimeException - Rectangle GetBoundingBoxOnScreen() - throw (css::lang::DisposedException, - css::uno::RuntimeException); + Rectangle GetBoundingBoxOnScreen(); /// @throws css::lang::DisposedException - void EnsureIsAlive() const throw ( css::lang::DisposedException ); + void EnsureIsAlive() const; void NotifyAccessibleEvent( sal_Int16 _nEventId, const css::uno::Any& _aOldValue, const css::uno::Any& _aNewValue ); @@ -117,7 +113,7 @@ namespace accessibility virtual void SAL_CALL disposing() override; // ListBoxAccessible/XComponent - virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) final override; + virtual void SAL_CALL dispose() final override; // OCommonAccessibleText virtual OUString implGetText() override; @@ -141,81 +137,80 @@ namespace accessibility protected: // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XAccessible - virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) override; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::lang::Locale SAL_CALL getLocale( ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) override; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) override; + virtual OUString SAL_CALL getAccessibleDescription( ) override; + virtual OUString SAL_CALL getAccessibleName( ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) override; + virtual css::lang::Locale SAL_CALL getLocale( ) override; // XAccessibleComponent - virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Rectangle SAL_CALL getBounds( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Point SAL_CALL getLocation( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Point SAL_CALL getLocationOnScreen( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Size SAL_CALL getSize( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grabFocus( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override; + virtual css::awt::Rectangle SAL_CALL getBounds( ) override; + virtual css::awt::Point SAL_CALL getLocation( ) override; + virtual css::awt::Point SAL_CALL getLocationOnScreen( ) override; + virtual css::awt::Size SAL_CALL getSize( ) override; + virtual void SAL_CALL grabFocus( ) override; + virtual sal_Int32 SAL_CALL getForeground( ) override; + virtual sal_Int32 SAL_CALL getBackground( ) override; // XAccessibleText - virtual sal_Int32 SAL_CALL getCaretPosition() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getCharacterCount() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSelectedText() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSelectionStart() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSelectionEnd() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCaretPosition() override; + virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override; + virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override; + virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) override; + virtual sal_Int32 SAL_CALL getCharacterCount() override; + virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) override; + virtual OUString SAL_CALL getSelectedText() override; + virtual sal_Int32 SAL_CALL getSelectionStart() override; + virtual sal_Int32 SAL_CALL getSelectionEnd() override; + virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual OUString SAL_CALL getText() override; + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override; + virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override; + virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override; + virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; // XAccessibleEventBroadcaster - virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override; + virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override; // XAccessibleAction - virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleActionDescription( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) override; + virtual sal_Bool SAL_CALL doAccessibleAction( sal_Int32 nIndex ) override; + virtual OUString SAL_CALL getAccessibleActionDescription( sal_Int32 nIndex ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) override; // XAccessibleSelection - void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - void SAL_CALL clearAccessibleSelection( ) throw (css::uno::RuntimeException, std::exception) override; - void SAL_CALL selectAllAccessibleChildren( ) throw (css::uno::RuntimeException, std::exception) override; - sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; - css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getCurrentValue( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getMaximumValue( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getMinimumValue( ) throw (css::uno::RuntimeException, std::exception) override; + void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override; + sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override; + void SAL_CALL clearAccessibleSelection( ) override; + void SAL_CALL selectAllAccessibleChildren( ) override; + sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) override; + css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override; + void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override; + virtual css::uno::Any SAL_CALL getCurrentValue( ) override; + virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) override; + virtual css::uno::Any SAL_CALL getMaximumValue( ) override; + virtual css::uno::Any SAL_CALL getMinimumValue( ) override; private: css::uno::Reference< css::accessibility::XAccessible > implGetParentAccessible( ) const; SvTreeListEntry* GetRealChild(sal_Int32 nIndex); diff --git a/accessibility/inc/extended/accessibletabbar.hxx b/accessibility/inc/extended/accessibletabbar.hxx index 6415a46844aa..9b95e994a885 100644 --- a/accessibility/inc/extended/accessibletabbar.hxx +++ b/accessibility/inc/extended/accessibletabbar.hxx @@ -56,7 +56,7 @@ namespace accessibility void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); // OCommonAccessibleComponent - virtual css::awt::Rectangle implGetBounds( ) throw (css::uno::RuntimeException) override; + virtual css::awt::Rectangle implGetBounds( ) override; // XComponent virtual void SAL_CALL disposing() override; @@ -72,35 +72,35 @@ namespace accessibility DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XAccessible - virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) override; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::lang::Locale SAL_CALL getLocale( ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) override; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) override; + virtual OUString SAL_CALL getAccessibleDescription( ) override; + virtual OUString SAL_CALL getAccessibleName( ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) override; + virtual css::lang::Locale SAL_CALL getLocale( ) override; // XAccessibleComponent - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grabFocus( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override; + virtual void SAL_CALL grabFocus( ) override; + virtual sal_Int32 SAL_CALL getForeground( ) override; + virtual sal_Int32 SAL_CALL getBackground( ) override; // XAccessibleExtendedComponent - virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTitledBorderText( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getToolTipText( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) override; + virtual OUString SAL_CALL getTitledBorderText( ) override; + virtual OUString SAL_CALL getToolTipText( ) override; }; diff --git a/accessibility/inc/extended/accessibletabbarpage.hxx b/accessibility/inc/extended/accessibletabbarpage.hxx index 04239d6fa0c8..3fa3d7a93a54 100644 --- a/accessibility/inc/extended/accessibletabbarpage.hxx +++ b/accessibility/inc/extended/accessibletabbarpage.hxx @@ -71,7 +71,7 @@ namespace accessibility void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); // OCommonAccessibleComponent - virtual css::awt::Rectangle implGetBounds( ) throw (css::uno::RuntimeException) override; + virtual css::awt::Rectangle implGetBounds( ) override; // XComponent virtual void SAL_CALL disposing() override; @@ -88,35 +88,35 @@ namespace accessibility DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XAccessible - virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) override; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::lang::Locale SAL_CALL getLocale( ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) override; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) override; + virtual OUString SAL_CALL getAccessibleDescription( ) override; + virtual OUString SAL_CALL getAccessibleName( ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) override; + virtual css::lang::Locale SAL_CALL getLocale( ) override; // XAccessibleComponent - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grabFocus( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override; + virtual void SAL_CALL grabFocus( ) override; + virtual sal_Int32 SAL_CALL getForeground( ) override; + virtual sal_Int32 SAL_CALL getBackground( ) override; // XAccessibleExtendedComponent - virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTitledBorderText( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getToolTipText( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) override; + virtual OUString SAL_CALL getTitledBorderText( ) override; + virtual OUString SAL_CALL getToolTipText( ) override; }; diff --git a/accessibility/inc/extended/accessibletabbarpagelist.hxx b/accessibility/inc/extended/accessibletabbarpagelist.hxx index f473fe9adfd2..be287316b426 100644 --- a/accessibility/inc/extended/accessibletabbarpagelist.hxx +++ b/accessibility/inc/extended/accessibletabbarpagelist.hxx @@ -67,7 +67,7 @@ namespace accessibility void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); // OCommonAccessibleComponent - virtual css::awt::Rectangle implGetBounds( ) throw (css::uno::RuntimeException) override; + virtual css::awt::Rectangle implGetBounds( ) override; // XComponent virtual void SAL_CALL disposing() override; @@ -83,44 +83,44 @@ namespace accessibility DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XAccessible - virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) override; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::lang::Locale SAL_CALL getLocale( ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) override; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) override; + virtual OUString SAL_CALL getAccessibleDescription( ) override; + virtual OUString SAL_CALL getAccessibleName( ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) override; + virtual css::lang::Locale SAL_CALL getLocale( ) override; // XAccessibleComponent - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grabFocus( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override; + virtual void SAL_CALL grabFocus( ) override; + virtual sal_Int32 SAL_CALL getForeground( ) override; + virtual sal_Int32 SAL_CALL getBackground( ) override; // XAccessibleExtendedComponent - virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTitledBorderText( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getToolTipText( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) override; + virtual OUString SAL_CALL getTitledBorderText( ) override; + virtual OUString SAL_CALL getToolTipText( ) override; // XAccessibleSelection - virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearAccessibleSelection( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL selectAllAccessibleChildren( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override; + virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override; + virtual void SAL_CALL clearAccessibleSelection( ) override; + virtual void SAL_CALL selectAllAccessibleChildren( ) override; + virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override; + virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) override; }; diff --git a/accessibility/inc/extended/accessibletablistbox.hxx b/accessibility/inc/extended/accessibletablistbox.hxx index 9673b8675884..bca61c58e09f 100644 --- a/accessibility/inc/extended/accessibletablistbox.hxx +++ b/accessibility/inc/extended/accessibletablistbox.hxx @@ -61,17 +61,14 @@ public: // XAccessibleContext ----------------------------------------------------- /** @return The count of visible children. */ - virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw ( css::uno::RuntimeException, std::exception ) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; /** @return The XAccessible interface of the specified child. */ virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleChild( sal_Int32 nChildIndex ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) override; + getAccessibleChild( sal_Int32 nChildIndex ) override; // XAccessibleContext - css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext() throw ( css::uno::RuntimeException, std::exception ) override; + css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext() override; // IAccessibleTabListBox virtual css::uno::Reference< css::accessibility::XAccessible > diff --git a/accessibility/inc/extended/accessibletablistboxtable.hxx b/accessibility/inc/extended/accessibletablistboxtable.hxx index 6a12f2ad829b..1a3bfc6c8dea 100644 --- a/accessibility/inc/extended/accessibletablistboxtable.hxx +++ b/accessibility/inc/extended/accessibletablistboxtable.hxx @@ -83,17 +83,16 @@ public: DECLARE_XTYPEPROVIDER( ) // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; // XAccessibleSelection - void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - void SAL_CALL clearAccessibleSelection( ) throw (css::uno::RuntimeException, std::exception) override; - void SAL_CALL selectAllAccessibleChildren( ) throw (css::uno::RuntimeException, std::exception) override; - sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; - css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override; + sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override; + void SAL_CALL clearAccessibleSelection( ) override; + void SAL_CALL selectAllAccessibleChildren( ) override; + sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) override; + css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override; + void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override; }; diff --git a/accessibility/inc/extended/listboxaccessible.hxx b/accessibility/inc/extended/listboxaccessible.hxx index 58576fd1e0e3..7e17bf55313d 100644 --- a/accessibility/inc/extended/listboxaccessible.hxx +++ b/accessibility/inc/extended/listboxaccessible.hxx @@ -60,7 +60,7 @@ namespace accessibility @throws css::uno::RuntimeException */ - virtual void SAL_CALL dispose() throw ( css::uno::RuntimeException, std::exception ) = 0; + virtual void SAL_CALL dispose() = 0; /// to be called in the dispose method of your derived class void disposing(); diff --git a/accessibility/inc/extended/textwindowaccessibility.hxx b/accessibility/inc/extended/textwindowaccessibility.hxx index 6cb2d6a30243..f7e739eb2d6e 100644 --- a/accessibility/inc/extended/textwindowaccessibility.hxx +++ b/accessibility/inc/extended/textwindowaccessibility.hxx @@ -169,196 +169,134 @@ protected: private: virtual css::uno::Reference< css::accessibility::XAccessibleContext > - SAL_CALL getAccessibleContext() throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getAccessibleContext() override; - virtual ::sal_Int32 SAL_CALL getAccessibleChildCount() - throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getAccessibleChildCount() override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleChild(::sal_Int32 i) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + getAccessibleChild(::sal_Int32 i) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleParent() throw (css::uno::RuntimeException, std::exception) override; + getAccessibleParent() override; - virtual ::sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getAccessibleIndexInParent() override; - virtual ::sal_Int16 SAL_CALL getAccessibleRole() - throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int16 SAL_CALL getAccessibleRole() override; - virtual OUString SAL_CALL getAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getAccessibleDescription() override; - virtual OUString SAL_CALL getAccessibleName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getAccessibleName() override; virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > - SAL_CALL getAccessibleRelationSet() throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getAccessibleRelationSet() override; virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL - getAccessibleStateSet() throw (css::uno::RuntimeException, std::exception) override; + getAccessibleStateSet() override; - virtual css::lang::Locale SAL_CALL getLocale() - throw (css::accessibility::IllegalAccessibleComponentStateException, - css::uno::RuntimeException, std::exception) override; + virtual css::lang::Locale SAL_CALL getLocale() override; - virtual sal_Bool SAL_CALL containsPoint(css::awt::Point const & rPoint) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL containsPoint(css::awt::Point const & rPoint) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleAtPoint(css::awt::Point const & rPoint) - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleAtPoint(css::awt::Point const & rPoint) override; - virtual css::awt::Rectangle SAL_CALL getBounds() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle SAL_CALL getBounds() override; - virtual css::awt::Point SAL_CALL getLocation() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocation() override; - virtual css::awt::Point SAL_CALL getLocationOnScreen() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getLocationOnScreen() override; - virtual css::awt::Size SAL_CALL getSize() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Size SAL_CALL getSize() override; - virtual void SAL_CALL grabFocus() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL grabFocus() override; - virtual css::util::Color SAL_CALL getForeground() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::util::Color SAL_CALL getForeground() override; - virtual css::util::Color SAL_CALL getBackground() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::util::Color SAL_CALL getBackground() override; - virtual ::sal_Int32 SAL_CALL getCaretPosition() - throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getCaretPosition() override; - virtual sal_Bool SAL_CALL setCaretPosition(::sal_Int32 nIndex) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL setCaretPosition(::sal_Int32 nIndex) override; - virtual ::sal_Unicode SAL_CALL getCharacter(::sal_Int32 nIndex) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + virtual ::sal_Unicode SAL_CALL getCharacter(::sal_Int32 nIndex) override; virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL - getCharacterAttributes(::sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + getCharacterAttributes(::sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override; virtual css::awt::Rectangle SAL_CALL - getCharacterBounds(::sal_Int32 nIndex) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + getCharacterBounds(::sal_Int32 nIndex) override; - virtual ::sal_Int32 SAL_CALL getCharacterCount() - throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getCharacterCount() override; virtual ::sal_Int32 SAL_CALL - getIndexAtPoint(css::awt::Point const & rPoint) - throw (css::uno::RuntimeException, std::exception) override; + getIndexAtPoint(css::awt::Point const & rPoint) override; - virtual OUString SAL_CALL getSelectedText() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getSelectedText() override; - virtual ::sal_Int32 SAL_CALL getSelectionStart() - throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getSelectionStart() override; - virtual ::sal_Int32 SAL_CALL getSelectionEnd() - throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getSelectionEnd() override; virtual sal_Bool SAL_CALL setSelection(::sal_Int32 nStartIndex, - ::sal_Int32 nEndIndex) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + ::sal_Int32 nEndIndex) override; - virtual OUString SAL_CALL getText() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getText() override; virtual OUString SAL_CALL getTextRange(::sal_Int32 nStartIndex, - ::sal_Int32 nEndIndex) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + ::sal_Int32 nEndIndex) override; - virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override; + virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override; + virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override; virtual sal_Bool SAL_CALL copyText(::sal_Int32 nStartIndex, - ::sal_Int32 nEndIndex) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + ::sal_Int32 nEndIndex) override; virtual sal_Bool SAL_CALL cutText(::sal_Int32 nStartIndex, - ::sal_Int32 nEndIndex) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + ::sal_Int32 nEndIndex) override; - virtual sal_Bool SAL_CALL pasteText(::sal_Int32 nIndex) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL pasteText(::sal_Int32 nIndex) override; virtual sal_Bool SAL_CALL deleteText(::sal_Int32 nStartIndex, - ::sal_Int32 nEndIndex) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + ::sal_Int32 nEndIndex) override; virtual sal_Bool SAL_CALL insertText(OUString const & rText, - ::sal_Int32 nIndex) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + ::sal_Int32 nIndex) override; virtual sal_Bool SAL_CALL replaceText( ::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex, - OUString const & rReplacement) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + OUString const & rReplacement) override; virtual sal_Bool SAL_CALL setAttributes( ::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex, css::uno::Sequence< css::beans::PropertyValue > const & - rAttributeSet) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + rAttributeSet) override; - virtual sal_Bool SAL_CALL setText(OUString const & rText) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL setText(OUString const & rText) override; virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL - getDefaultAttributes(const css::uno::Sequence< OUString >& RequestedAttributes) - throw (css::uno::RuntimeException, std::exception) override; + getDefaultAttributes(const css::uno::Sequence< OUString >& RequestedAttributes) override; virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL - getRunAttributes(::sal_Int32 Index, const css::uno::Sequence< OUString >& RequestedAttributes) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + getRunAttributes(::sal_Int32 Index, const css::uno::Sequence< OUString >& RequestedAttributes) override; - virtual ::sal_Int32 SAL_CALL getLineNumberAtIndex( ::sal_Int32 nIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getLineNumberAtIndex( ::sal_Int32 nIndex ) override; - virtual css::accessibility::TextSegment SAL_CALL getTextAtLineNumber( ::sal_Int32 nLineNo ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + virtual css::accessibility::TextSegment SAL_CALL getTextAtLineNumber( ::sal_Int32 nLineNo ) override; - virtual css::accessibility::TextSegment SAL_CALL getTextAtLineWithCaret( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::accessibility::TextSegment SAL_CALL getTextAtLineWithCaret( ) override; - virtual ::sal_Int32 SAL_CALL getNumberOfLineWithCaret( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getNumberOfLineWithCaret( ) override; virtual void SAL_CALL addAccessibleEventListener( css::uno::Reference< - css::accessibility::XAccessibleEventListener > const & rListener) - throw (css::uno::RuntimeException, std::exception) override; + css::accessibility::XAccessibleEventListener > const & rListener) override; virtual void SAL_CALL removeAccessibleEventListener( css::uno::Reference< - css::accessibility::XAccessibleEventListener > const & rListener) - throw (css::uno::RuntimeException, std::exception) override; + css::accessibility::XAccessibleEventListener > const & rListener) override; virtual void SAL_CALL disposing() override; @@ -550,20 +488,15 @@ public: retrieveParagraphRelationSet( Paragraph const * pParagraph ); private: - virtual ::sal_Int32 SAL_CALL getAccessibleChildCount() - throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getAccessibleChildCount() override; virtual css::uno::Reference< css::accessibility::XAccessible > - SAL_CALL getAccessibleChild(::sal_Int32 i) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + SAL_CALL getAccessibleChild(::sal_Int32 i) override; - virtual ::sal_Int16 SAL_CALL getAccessibleRole() - throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int16 SAL_CALL getAccessibleRole() override; virtual css::uno::Reference< css::accessibility::XAccessible > - SAL_CALL getAccessibleAtPoint(css::awt::Point const & rPoint) - throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getAccessibleAtPoint(css::awt::Point const & rPoint) override; virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override; virtual void FillAccessibleRelationSet( utl::AccessibleRelationSetHelper& rRelationSet ) override; diff --git a/accessibility/inc/standard/accessiblemenubasecomponent.hxx b/accessibility/inc/standard/accessiblemenubasecomponent.hxx index 417e7a6bcf12..af8e9d640301 100644 --- a/accessibility/inc/standard/accessiblemenubasecomponent.hxx +++ b/accessibility/inc/standard/accessiblemenubasecomponent.hxx @@ -132,13 +132,13 @@ public: DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override; // XAccessible - virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) override; // XAccessibleContext - virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) override; }; #endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_ACCESSIBLEMENUBASECOMPONENT_HXX diff --git a/accessibility/inc/standard/accessiblemenucomponent.hxx b/accessibility/inc/standard/accessiblemenucomponent.hxx index de067b850357..f2ef7294ba8e 100644 --- a/accessibility/inc/standard/accessiblemenucomponent.hxx +++ b/accessibility/inc/standard/accessiblemenucomponent.hxx @@ -40,7 +40,7 @@ protected: virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override; // OCommonAccessibleComponent - virtual css::awt::Rectangle implGetBounds( ) throw (css::uno::RuntimeException) override; + virtual css::awt::Rectangle implGetBounds( ) override; public: OAccessibleMenuComponent( Menu* pMenu ); @@ -53,35 +53,35 @@ public: DECLARE_XTYPEPROVIDER() // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::lang::Locale SAL_CALL getLocale( ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) override; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) override; + virtual OUString SAL_CALL getAccessibleDescription( ) override; + virtual OUString SAL_CALL getAccessibleName( ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) override; + virtual css::lang::Locale SAL_CALL getLocale( ) override; // XAccessibleComponent - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Point SAL_CALL getLocationOnScreen( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grabFocus( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override; + virtual css::awt::Point SAL_CALL getLocationOnScreen( ) override; + virtual void SAL_CALL grabFocus( ) override; + virtual sal_Int32 SAL_CALL getForeground( ) override; + virtual sal_Int32 SAL_CALL getBackground( ) override; // XAccessibleExtendedComponent - virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTitledBorderText( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getToolTipText( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) override; + virtual OUString SAL_CALL getTitledBorderText( ) override; + virtual OUString SAL_CALL getToolTipText( ) override; // XAccessibleSelection - virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearAccessibleSelection( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL selectAllAccessibleChildren( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override; + virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override; + virtual void SAL_CALL clearAccessibleSelection( ) override; + virtual void SAL_CALL selectAllAccessibleChildren( ) override; + virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override; + virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) override; }; #endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_ACCESSIBLEMENUCOMPONENT_HXX diff --git a/accessibility/inc/standard/accessiblemenuitemcomponent.hxx b/accessibility/inc/standard/accessiblemenuitemcomponent.hxx index acb6452faa09..0d893dde1c1f 100644 --- a/accessibility/inc/standard/accessiblemenuitemcomponent.hxx +++ b/accessibility/inc/standard/accessiblemenuitemcomponent.hxx @@ -53,7 +53,7 @@ protected: virtual void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ) override; // OCommonAccessibleComponent - virtual css::awt::Rectangle implGetBounds( ) throw (css::uno::RuntimeException) override; + virtual css::awt::Rectangle implGetBounds( ) override; // XComponent virtual void SAL_CALL disposing() override; @@ -63,26 +63,26 @@ public: virtual ~OAccessibleMenuItemComponent() override; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::lang::Locale SAL_CALL getLocale( ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) override; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) override; + virtual OUString SAL_CALL getAccessibleDescription( ) override; + virtual OUString SAL_CALL getAccessibleName( ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) override; + virtual css::lang::Locale SAL_CALL getLocale( ) override; // XAccessibleComponent - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grabFocus( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override; + virtual void SAL_CALL grabFocus( ) override; + virtual sal_Int32 SAL_CALL getForeground( ) override; + virtual sal_Int32 SAL_CALL getBackground( ) override; // XAccessibleExtendedComponent - virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTitledBorderText( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getToolTipText( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) override; + virtual OUString SAL_CALL getTitledBorderText( ) override; + virtual OUString SAL_CALL getToolTipText( ) override; }; #endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_ACCESSIBLEMENUITEMCOMPONENT_HXX diff --git a/accessibility/inc/standard/vclxaccessiblebox.hxx b/accessibility/inc/standard/vclxaccessiblebox.hxx index a4fbce5b5eb7..b16a12f7702f 100644 --- a/accessibility/inc/standard/vclxaccessiblebox.hxx +++ b/accessibility/inc/standard/vclxaccessiblebox.hxx @@ -62,7 +62,7 @@ public: // XAccessible virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL - getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override; + getAccessibleContext( ) override; // XAccessibleContext @@ -70,62 +70,47 @@ public: actual list. The text field is not provided for non drop down list boxes. */ - sal_Int32 SAL_CALL getAccessibleChildCount() - throw (css::uno::RuntimeException, std::exception) override; + sal_Int32 SAL_CALL getAccessibleChildCount() override; /** For drop down list boxes the text field is a not editable VCLXAccessibleTextField, for combo boxes it is an editable VLCAccessibleEdit. */ css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleChild (sal_Int32 i) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + getAccessibleChild (sal_Int32 i) override; /** The role is always AccessibleRole::COMBO_BOX. */ - sal_Int16 SAL_CALL getAccessibleRole() - throw (css::uno::RuntimeException, std::exception) override; + sal_Int16 SAL_CALL getAccessibleRole() override; - sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw (css::uno::RuntimeException, std::exception) override; + sal_Int32 SAL_CALL getAccessibleIndexInParent() override; // XAccessibleAction /** There is one action for drop down boxes and none for others. */ - virtual sal_Int32 SAL_CALL getAccessibleActionCount() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleActionCount() override; /** The action for drop down boxes lets the user toggle the visibility of the popup menu. */ - virtual sal_Bool SAL_CALL doAccessibleAction (sal_Int32 nIndex) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL doAccessibleAction (sal_Int32 nIndex) override; /** The returned string is associated with resource RID_STR_ACC_ACTION_TOGGLEPOPUP. */ - virtual OUString SAL_CALL getAccessibleActionDescription (sal_Int32 nIndex) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getAccessibleActionDescription (sal_Int32 nIndex) override; /** No keybinding returned so far. */ virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL - getAccessibleActionKeyBinding( sal_Int32 nIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + getAccessibleActionKeyBinding( sal_Int32 nIndex ) override; // XAccessibleValue - virtual css::uno::Any SAL_CALL getCurrentValue( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getCurrentValue( ) override; virtual sal_Bool SAL_CALL setCurrentValue( - const css::uno::Any& aNumber ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Any& aNumber ) override; - virtual css::uno::Any SAL_CALL getMaximumValue( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getMaximumValue( ) override; - virtual css::uno::Any SAL_CALL getMinimumValue( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getMinimumValue( ) override; protected: /** Specifies whether the box is a combo box or a list box. List boxes have multi selection. diff --git a/accessibility/inc/standard/vclxaccessiblebutton.hxx b/accessibility/inc/standard/vclxaccessiblebutton.hxx index 2a61a4e3b762..af9e49c4a938 100644 --- a/accessibility/inc/standard/vclxaccessiblebutton.hxx +++ b/accessibility/inc/standard/vclxaccessiblebutton.hxx @@ -54,23 +54,23 @@ public: DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XAccessibleContext - virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getAccessibleName( ) override; // XAccessibleAction - virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) override; + virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) override; + virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) override; // XAccessibleValue - virtual css::uno::Any SAL_CALL getCurrentValue( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getMaximumValue( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getMinimumValue( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getCurrentValue( ) override; + virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) override; + virtual css::uno::Any SAL_CALL getMaximumValue( ) override; + virtual css::uno::Any SAL_CALL getMinimumValue( ) override; }; #endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEBUTTON_HXX diff --git a/accessibility/inc/standard/vclxaccessiblecheckbox.hxx b/accessibility/inc/standard/vclxaccessiblecheckbox.hxx index 218d8a21e9b4..647c7b18f6f3 100644 --- a/accessibility/inc/standard/vclxaccessiblecheckbox.hxx +++ b/accessibility/inc/standard/vclxaccessiblecheckbox.hxx @@ -64,20 +64,20 @@ public: DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XAccessibleAction - virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) override; + virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) override; + virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) override; // XAccessibleValue - virtual css::uno::Any SAL_CALL getCurrentValue( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getMaximumValue( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getMinimumValue( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getCurrentValue( ) override; + virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) override; + virtual css::uno::Any SAL_CALL getMaximumValue( ) override; + virtual css::uno::Any SAL_CALL getMinimumValue( ) override; }; #endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLECHECKBOX_HXX diff --git a/accessibility/inc/standard/vclxaccessiblecombobox.hxx b/accessibility/inc/standard/vclxaccessiblecombobox.hxx index 2f64a22c827d..dcd36fcfb60b 100644 --- a/accessibility/inc/standard/vclxaccessiblecombobox.hxx +++ b/accessibility/inc/standard/vclxaccessiblecombobox.hxx @@ -38,12 +38,10 @@ public: VCLXAccessibleComboBox (VCLXWindow* pVCLXindow); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; // Return combo box specific services. virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; protected: virtual ~VCLXAccessibleComboBox() override; diff --git a/accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx b/accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx index 1368ba119540..72559afe66dd 100644 --- a/accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx +++ b/accessibility/inc/standard/vclxaccessibledropdowncombobox.hxx @@ -37,12 +37,10 @@ public: VCLXAccessibleDropDownComboBox (VCLXWindow* pVCLXindow); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; // Return drop down combo box specific services. virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; protected: virtual ~VCLXAccessibleDropDownComboBox() override; diff --git a/accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx b/accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx index b9a10722998f..5c00b33b6bb6 100644 --- a/accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx +++ b/accessibility/inc/standard/vclxaccessibledropdownlistbox.hxx @@ -36,12 +36,10 @@ public: VCLXAccessibleDropDownListBox (VCLXWindow* pVCLXindow); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; // Return drop down list box specific services. virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; protected: virtual ~VCLXAccessibleDropDownListBox() override; diff --git a/accessibility/inc/standard/vclxaccessibleedit.hxx b/accessibility/inc/standard/vclxaccessibleedit.hxx index a9045839fed6..61ee87ee1102 100644 --- a/accessibility/inc/standard/vclxaccessibleedit.hxx +++ b/accessibility/inc/standard/vclxaccessibleedit.hxx @@ -63,47 +63,47 @@ public: DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) override; // XAccessibleAction - virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) override; + virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) override; + virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) override; // XAccessibleText - virtual sal_Int32 SAL_CALL getCaretPosition( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getCharacterCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSelectedText( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSelectionStart( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSelectionEnd( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getText( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCaretPosition( ) override; + virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override; + virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override; + virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) override; + virtual sal_Int32 SAL_CALL getCharacterCount( ) override; + virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) override; + virtual OUString SAL_CALL getSelectedText( ) override; + virtual sal_Int32 SAL_CALL getSelectionStart( ) override; + virtual sal_Int32 SAL_CALL getSelectionEnd( ) override; + virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual OUString SAL_CALL getText( ) override; + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override; + virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override; + virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override; + virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; // XAccessibleEditableText - virtual sal_Bool SAL_CALL cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL pasteText( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL insertText( const OUString& sText, sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const css::uno::Sequence< css::beans::PropertyValue >& aAttributeSet ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setText( const OUString& sText ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual sal_Bool SAL_CALL pasteText( sal_Int32 nIndex ) override; + virtual sal_Bool SAL_CALL deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual sal_Bool SAL_CALL insertText( const OUString& sText, sal_Int32 nIndex ) override; + virtual sal_Bool SAL_CALL replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement ) override; + virtual sal_Bool SAL_CALL setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const css::uno::Sequence< css::beans::PropertyValue >& aAttributeSet ) override; + virtual sal_Bool SAL_CALL setText( const OUString& sText ) override; }; #endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEEDIT_HXX diff --git a/accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx b/accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx index da5341193a40..0cb1d2f96813 100644 --- a/accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx +++ b/accessibility/inc/standard/vclxaccessiblefixedhyperlink.hxx @@ -35,8 +35,8 @@ public: VCLXAccessibleFixedHyperlink( VCLXWindow* pVCLXindow ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; #endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEFIXEDHYPERLINK_HXX diff --git a/accessibility/inc/standard/vclxaccessiblefixedtext.hxx b/accessibility/inc/standard/vclxaccessiblefixedtext.hxx index 4f870beab961..98b70542f639 100644 --- a/accessibility/inc/standard/vclxaccessiblefixedtext.hxx +++ b/accessibility/inc/standard/vclxaccessiblefixedtext.hxx @@ -37,8 +37,8 @@ public: VCLXAccessibleFixedText( VCLXWindow* pVCLXindow ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; #endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEFIXEDTEXT_HXX diff --git a/accessibility/inc/standard/vclxaccessiblelist.hxx b/accessibility/inc/standard/vclxaccessiblelist.hxx index cd79888f8922..b05bbd6d37ac 100644 --- a/accessibility/inc/standard/vclxaccessiblelist.hxx +++ b/accessibility/inc/standard/vclxaccessiblelist.hxx @@ -88,45 +88,37 @@ public: // XAccessible virtual css::uno::Reference< css::accessibility::XAccessibleContext> SAL_CALL - getAccessibleContext() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleContext() override; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleChild (sal_Int32 i) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + getAccessibleChild (sal_Int32 i) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleParent( ) - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleParent( ) override; /** The index returned as index in parent is always the one set with the SetIndexInParent() method. */ - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getAccessibleRole() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override; + virtual sal_Int16 SAL_CALL getAccessibleRole() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; // Return list specific services. virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; // XAccessibleSelection - virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearAccessibleSelection( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL selectAllAccessibleChildren( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - - virtual css::awt::Point SAL_CALL getLocationOnScreen( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override; + virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override; + virtual void SAL_CALL clearAccessibleSelection( ) override; + virtual void SAL_CALL selectAllAccessibleChildren( ) override; + virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override; + virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) override; + + virtual css::awt::Point SAL_CALL getLocationOnScreen( ) override; bool IsInDropDown(); void HandleDropOpen(); void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent, bool b_IsDropDownList); @@ -181,7 +173,7 @@ protected: void HandleChangedItemList (bool bItemInserted, sal_Int32 nIndex); // VCLXAccessibleComponent - virtual css::awt::Rectangle implGetBounds( ) throw (css::uno::RuntimeException) override; + virtual css::awt::Rectangle implGetBounds( ) override; private: /** We need to save the accessible parent to return it in getAccessibleParent(), diff --git a/accessibility/inc/standard/vclxaccessiblelistbox.hxx b/accessibility/inc/standard/vclxaccessiblelistbox.hxx index 0ef7a3ed7e08..47890c9378ca 100644 --- a/accessibility/inc/standard/vclxaccessiblelistbox.hxx +++ b/accessibility/inc/standard/vclxaccessiblelistbox.hxx @@ -37,12 +37,10 @@ public: VCLXAccessibleListBox (VCLXWindow* pVCLXindow); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; // Return list box specific services. virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; protected: virtual ~VCLXAccessibleListBox() override; diff --git a/accessibility/inc/standard/vclxaccessiblelistitem.hxx b/accessibility/inc/standard/vclxaccessiblelistitem.hxx index cbf874e41cb8..57c93997c24b 100644 --- a/accessibility/inc/standard/vclxaccessiblelistitem.hxx +++ b/accessibility/inc/standard/vclxaccessiblelistitem.hxx @@ -97,61 +97,61 @@ public: void SetVisible( bool _bVisible ); // XTypeProvider - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XAccessible - virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) override; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::lang::Locale SAL_CALL getLocale( ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) override; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) override; + virtual OUString SAL_CALL getAccessibleDescription( ) override; + virtual OUString SAL_CALL getAccessibleName( ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) override; + virtual css::lang::Locale SAL_CALL getLocale( ) override; // XAccessibleComponent - virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Rectangle SAL_CALL getBounds( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Point SAL_CALL getLocation( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Point SAL_CALL getLocationOnScreen( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Size SAL_CALL getSize( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grabFocus( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getForeground() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getBackground() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override; + virtual css::awt::Rectangle SAL_CALL getBounds( ) override; + virtual css::awt::Point SAL_CALL getLocation( ) override; + virtual css::awt::Point SAL_CALL getLocationOnScreen( ) override; + virtual css::awt::Size SAL_CALL getSize( ) override; + virtual void SAL_CALL grabFocus( ) override; + virtual sal_Int32 SAL_CALL getForeground() override; + virtual sal_Int32 SAL_CALL getBackground() override; // XAccessibleText - virtual sal_Int32 SAL_CALL getCaretPosition() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getCharacterCount() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSelectedText() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSelectionStart() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSelectionEnd() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCaretPosition() override; + virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override; + virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override; + virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) override; + virtual sal_Int32 SAL_CALL getCharacterCount() override; + virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) override; + virtual OUString SAL_CALL getSelectedText() override; + virtual sal_Int32 SAL_CALL getSelectionStart() override; + virtual sal_Int32 SAL_CALL getSelectionEnd() override; + virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual OUString SAL_CALL getText() override; + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override; + virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override; + virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override; + virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; // XAccessibleEventBroadcaster - virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override; + virtual void SAL_CALL removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override; }; #endif // ACCESSIBILITY_STANDARD_ACCESSIBLELISTBOXENTRY_HXX diff --git a/accessibility/inc/standard/vclxaccessiblemenu.hxx b/accessibility/inc/standard/vclxaccessiblemenu.hxx index 27cd4149c771..58c0b116f662 100644 --- a/accessibility/inc/standard/vclxaccessiblemenu.hxx +++ b/accessibility/inc/standard/vclxaccessiblemenu.hxx @@ -50,28 +50,28 @@ public: DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) override; // XAccessibleComponent - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override; // XAccessibleSelection - virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearAccessibleSelection( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL selectAllAccessibleChildren( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override; + virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override; + virtual void SAL_CALL clearAccessibleSelection( ) override; + virtual void SAL_CALL selectAllAccessibleChildren( ) override; + virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override; + virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) override; // XAccessibleAction - virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual ::rtl::OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) override; }; #endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEMENU_HXX diff --git a/accessibility/inc/standard/vclxaccessiblemenubar.hxx b/accessibility/inc/standard/vclxaccessiblemenubar.hxx index a4ecc4097335..2c795cd31992 100644 --- a/accessibility/inc/standard/vclxaccessiblemenubar.hxx +++ b/accessibility/inc/standard/vclxaccessiblemenubar.hxx @@ -50,15 +50,15 @@ public: virtual ~VCLXAccessibleMenuBar() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) override; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) override; // XAccessibleExtendedComponent - virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getBackground( ) override; }; #endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEMENUBAR_HXX diff --git a/accessibility/inc/standard/vclxaccessiblemenuitem.hxx b/accessibility/inc/standard/vclxaccessiblemenuitem.hxx index ecb39a44d92e..ee0ccd5589e8 100644 --- a/accessibility/inc/standard/vclxaccessiblemenuitem.hxx +++ b/accessibility/inc/standard/vclxaccessiblemenuitem.hxx @@ -66,42 +66,42 @@ public: DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XAccessibleContext - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) override; // XAccessibleText - virtual sal_Int32 SAL_CALL getCaretPosition() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getCharacterCount() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSelectedText() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSelectionStart() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSelectionEnd() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCaretPosition() override; + virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override; + virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override; + virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) override; + virtual sal_Int32 SAL_CALL getCharacterCount() override; + virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) override; + virtual OUString SAL_CALL getSelectedText() override; + virtual sal_Int32 SAL_CALL getSelectionStart() override; + virtual sal_Int32 SAL_CALL getSelectionEnd() override; + virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual OUString SAL_CALL getText() override; + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override; + virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override; + virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override; + virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; // XAccessibleAction - virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) override; + virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) override; + virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) override; // XAccessibleValue - virtual css::uno::Any SAL_CALL getCurrentValue( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getMaximumValue( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getMinimumValue( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getCurrentValue( ) override; + virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) override; + virtual css::uno::Any SAL_CALL getMaximumValue( ) override; + virtual css::uno::Any SAL_CALL getMinimumValue( ) override; }; #endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEMENUITEM_HXX diff --git a/accessibility/inc/standard/vclxaccessiblemenuseparator.hxx b/accessibility/inc/standard/vclxaccessiblemenuseparator.hxx index c477caa7450e..2b4a49b7473b 100644 --- a/accessibility/inc/standard/vclxaccessiblemenuseparator.hxx +++ b/accessibility/inc/standard/vclxaccessiblemenuseparator.hxx @@ -33,11 +33,11 @@ public: virtual ~VCLXAccessibleMenuSeparator() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XAccessibleContext - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) override; }; diff --git a/accessibility/inc/standard/vclxaccessiblepopupmenu.hxx b/accessibility/inc/standard/vclxaccessiblepopupmenu.hxx index 112ea3dbb5c7..e576189c0048 100644 --- a/accessibility/inc/standard/vclxaccessiblepopupmenu.hxx +++ b/accessibility/inc/standard/vclxaccessiblepopupmenu.hxx @@ -36,15 +36,15 @@ public: virtual ~VCLXAccessiblePopupMenu() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) override; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) override; // XAccessibleExtendedComponent - virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getBackground( ) override; }; #endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLEPOPUPMENU_HXX diff --git a/accessibility/inc/standard/vclxaccessibleradiobutton.hxx b/accessibility/inc/standard/vclxaccessibleradiobutton.hxx index 1d36eb87efbf..a3643a61c6e9 100644 --- a/accessibility/inc/standard/vclxaccessibleradiobutton.hxx +++ b/accessibility/inc/standard/vclxaccessibleradiobutton.hxx @@ -55,20 +55,20 @@ public: DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XAccessibleAction - virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) override; + virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) override; + virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) override; // XAccessibleValue - virtual css::uno::Any SAL_CALL getCurrentValue( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getMaximumValue( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getMinimumValue( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getCurrentValue( ) override; + virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) override; + virtual css::uno::Any SAL_CALL getMaximumValue( ) override; + virtual css::uno::Any SAL_CALL getMinimumValue( ) override; }; #endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLERADIOBUTTON_HXX diff --git a/accessibility/inc/standard/vclxaccessiblescrollbar.hxx b/accessibility/inc/standard/vclxaccessiblescrollbar.hxx index bd9ba54d5f8a..19537d7739a9 100644 --- a/accessibility/inc/standard/vclxaccessiblescrollbar.hxx +++ b/accessibility/inc/standard/vclxaccessiblescrollbar.hxx @@ -54,23 +54,23 @@ public: DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XAccessibleAction - virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) override; + virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) override; + virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) override; // XAccessibleValue - virtual css::uno::Any SAL_CALL getCurrentValue( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getMaximumValue( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getMinimumValue( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getCurrentValue( ) override; + virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) override; + virtual css::uno::Any SAL_CALL getMaximumValue( ) override; + virtual css::uno::Any SAL_CALL getMinimumValue( ) override; // XAccessibleContext - ::rtl::OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override; + ::rtl::OUString SAL_CALL getAccessibleName( ) override; }; diff --git a/accessibility/inc/standard/vclxaccessiblestatusbar.hxx b/accessibility/inc/standard/vclxaccessiblestatusbar.hxx index 467b7d191192..ebe9ac1a6ae4 100644 --- a/accessibility/inc/standard/vclxaccessiblestatusbar.hxx +++ b/accessibility/inc/standard/vclxaccessiblestatusbar.hxx @@ -57,15 +57,15 @@ public: virtual ~VCLXAccessibleStatusBar() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override; // XAccessibleComponent - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override; }; diff --git a/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx b/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx index 6bd8a3961ad7..5fb0813a44f8 100644 --- a/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx +++ b/accessibility/inc/standard/vclxaccessiblestatusbaritem.hxx @@ -68,7 +68,7 @@ protected: void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); // OCommonAccessibleComponent - virtual css::awt::Rectangle implGetBounds( ) throw (css::uno::RuntimeException) override; + virtual css::awt::Rectangle implGetBounds( ) override; // OCommonAccessibleText virtual OUString implGetText() override; @@ -89,44 +89,44 @@ public: DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XAccessible - virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) override; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::lang::Locale SAL_CALL getLocale( ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) override; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) override; + virtual OUString SAL_CALL getAccessibleDescription( ) override; + virtual OUString SAL_CALL getAccessibleName( ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) override; + virtual css::lang::Locale SAL_CALL getLocale( ) override; // XAccessibleComponent - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grabFocus( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override; + virtual void SAL_CALL grabFocus( ) override; + virtual sal_Int32 SAL_CALL getForeground( ) override; + virtual sal_Int32 SAL_CALL getBackground( ) override; // XAccessibleExtendedComponent - virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTitledBorderText( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getToolTipText( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) override; + virtual OUString SAL_CALL getTitledBorderText( ) override; + virtual OUString SAL_CALL getToolTipText( ) override; // XAccessibleText - virtual sal_Int32 SAL_CALL getCaretPosition() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCaretPosition() override; + virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override; + virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) override; + virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) override; + virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; }; #endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLESTATUSBARITEM_HXX diff --git a/accessibility/inc/standard/vclxaccessibletabcontrol.hxx b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx index faa3c684f32e..bdef5ef291da 100644 --- a/accessibility/inc/standard/vclxaccessibletabcontrol.hxx +++ b/accessibility/inc/standard/vclxaccessibletabcontrol.hxx @@ -71,23 +71,23 @@ public: DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) override; + virtual OUString SAL_CALL getAccessibleName( ) override; // XAccessibleSelection - virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearAccessibleSelection( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL selectAllAccessibleChildren( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override; + virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override; + virtual void SAL_CALL clearAccessibleSelection( ) override; + virtual void SAL_CALL selectAllAccessibleChildren( ) override; + virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override; + virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) override; }; diff --git a/accessibility/inc/standard/vclxaccessibletabpage.hxx b/accessibility/inc/standard/vclxaccessibletabpage.hxx index 1232259cef93..d5153b11f630 100644 --- a/accessibility/inc/standard/vclxaccessibletabpage.hxx +++ b/accessibility/inc/standard/vclxaccessibletabpage.hxx @@ -73,7 +73,7 @@ protected: void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); // OCommonAccessibleComponent - virtual css::awt::Rectangle implGetBounds( ) throw (css::uno::RuntimeException) override; + virtual css::awt::Rectangle implGetBounds( ) override; // OCommonAccessibleText virtual OUString implGetText() override; @@ -94,44 +94,44 @@ public: DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XAccessible - virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) override; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::lang::Locale SAL_CALL getLocale( ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) override; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) override; + virtual OUString SAL_CALL getAccessibleDescription( ) override; + virtual OUString SAL_CALL getAccessibleName( ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) override; + virtual css::lang::Locale SAL_CALL getLocale( ) override; // XAccessibleComponent - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grabFocus( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override; + virtual void SAL_CALL grabFocus( ) override; + virtual sal_Int32 SAL_CALL getForeground( ) override; + virtual sal_Int32 SAL_CALL getBackground( ) override; // XAccessibleExtendedComponent - virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTitledBorderText( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getToolTipText( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) override; + virtual OUString SAL_CALL getTitledBorderText( ) override; + virtual OUString SAL_CALL getToolTipText( ) override; // XAccessibleText - virtual sal_Int32 SAL_CALL getCaretPosition() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCaretPosition() override; + virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override; + virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) override; + virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) override; + virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; }; #endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETABPAGE_HXX diff --git a/accessibility/inc/standard/vclxaccessibletabpagewindow.hxx b/accessibility/inc/standard/vclxaccessibletabpagewindow.hxx index d7e7388e9976..aeaf923e0f12 100644 --- a/accessibility/inc/standard/vclxaccessibletabpagewindow.hxx +++ b/accessibility/inc/standard/vclxaccessibletabpagewindow.hxx @@ -40,7 +40,7 @@ private: protected: // OCommonAccessibleComponent - virtual css::awt::Rectangle implGetBounds( ) throw (css::uno::RuntimeException) override; + virtual css::awt::Rectangle implGetBounds( ) override; // XComponent virtual void SAL_CALL disposing() override; @@ -50,8 +50,8 @@ public: virtual ~VCLXAccessibleTabPageWindow() override; // XAccessibleContext - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) override; }; diff --git a/accessibility/inc/standard/vclxaccessibletextcomponent.hxx b/accessibility/inc/standard/vclxaccessibletextcomponent.hxx index 5eba648cdde1..b5ae9e510be1 100644 --- a/accessibility/inc/standard/vclxaccessibletextcomponent.hxx +++ b/accessibility/inc/standard/vclxaccessibletextcomponent.hxx @@ -60,23 +60,23 @@ public: DECLARE_XTYPEPROVIDER() // XAccessibleText - virtual sal_Int32 SAL_CALL getCaretPosition() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getCharacterCount() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSelectedText() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSelectionStart() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSelectionEnd() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getText() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCaretPosition() override; + virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override; + virtual sal_Unicode SAL_CALL getCharacter( sal_Int32 nIndex ) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override; + virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) override; + virtual sal_Int32 SAL_CALL getCharacterCount() override; + virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) override; + virtual OUString SAL_CALL getSelectedText() override; + virtual sal_Int32 SAL_CALL getSelectionStart() override; + virtual sal_Int32 SAL_CALL getSelectionEnd() override; + virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual OUString SAL_CALL getText() override; + virtual OUString SAL_CALL getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual css::accessibility::TextSegment SAL_CALL getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override; + virtual css::accessibility::TextSegment SAL_CALL getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override; + virtual css::accessibility::TextSegment SAL_CALL getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) override; + virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; }; diff --git a/accessibility/inc/standard/vclxaccessibletextfield.hxx b/accessibility/inc/standard/vclxaccessibletextfield.hxx index 7d57a7c2cd4e..f1bb4fec8aa1 100644 --- a/accessibility/inc/standard/vclxaccessibletextfield.hxx +++ b/accessibility/inc/standard/vclxaccessibletextfield.hxx @@ -49,28 +49,21 @@ public: // XAccessible css::uno::Reference< css::accessibility::XAccessibleContext> SAL_CALL - getAccessibleContext() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleContext() override; // XAccessibleContext - sal_Int32 SAL_CALL getAccessibleChildCount() - throw (css::uno::RuntimeException, std::exception) override; + sal_Int32 SAL_CALL getAccessibleChildCount() override; css::uno::Reference< css::accessibility::XAccessible> SAL_CALL - getAccessibleChild (sal_Int32 i) - throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - sal_Int16 SAL_CALL getAccessibleRole() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleChild (sal_Int32 i) override; + sal_Int16 SAL_CALL getAccessibleRole() override; css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleParent( ) - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleParent( ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; // Return text field specific services. virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; protected: virtual ~VCLXAccessibleTextField() override; diff --git a/accessibility/inc/standard/vclxaccessibletoolbox.hxx b/accessibility/inc/standard/vclxaccessibletoolbox.hxx index 368de4326402..f914075ff0ce 100644 --- a/accessibility/inc/standard/vclxaccessibletoolbox.hxx +++ b/accessibility/inc/standard/vclxaccessibletoolbox.hxx @@ -76,22 +76,22 @@ public: DECLARE_XTYPEPROVIDER( ) // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override; // XAccessibleSelection - virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearAccessibleSelection( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL selectAllAccessibleChildren( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override; + virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override; + virtual void SAL_CALL clearAccessibleSelection( ) override; + virtual void SAL_CALL selectAllAccessibleChildren( ) override; + virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override; + virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) override; private: void implReleaseToolboxItem( diff --git a/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx b/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx index ba97b30abc18..77f8411d8295 100644 --- a/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx +++ b/accessibility/inc/standard/vclxaccessibletoolboxitem.hxx @@ -68,7 +68,7 @@ protected: virtual void SAL_CALL disposing() override; /// implements the calculation of the bounding rectangle - virtual css::awt::Rectangle implGetBounds( ) throw (css::uno::RuntimeException) override; + virtual css::awt::Rectangle implGetBounds( ) override; // OCommonAccessibleText virtual OUString implGetText() override; @@ -98,55 +98,55 @@ public: DECLARE_XTYPEPROVIDER( ) // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XAccessible - virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) override; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) override; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) override; + virtual OUString SAL_CALL getAccessibleDescription( ) override; + virtual OUString SAL_CALL getAccessibleName( ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) override; // XAccessibleText - virtual sal_Int32 SAL_CALL getCaretPosition() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCaretPosition() override; + virtual sal_Bool SAL_CALL setCaretPosition( sal_Int32 nIndex ) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes ) override; + virtual css::awt::Rectangle SAL_CALL getCharacterBounds( sal_Int32 nIndex ) override; + virtual sal_Int32 SAL_CALL getIndexAtPoint( const css::awt::Point& aPoint ) override; + virtual sal_Bool SAL_CALL setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual sal_Bool SAL_CALL copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; // XAccessibleComponent - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grabFocus( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override; + virtual void SAL_CALL grabFocus( ) override; + virtual sal_Int32 SAL_CALL getForeground( ) override; + virtual sal_Int32 SAL_CALL getBackground( ) override; // XAccessibleExtendedComponent - virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTitledBorderText( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getToolTipText( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) override; + virtual OUString SAL_CALL getTitledBorderText( ) override; + virtual OUString SAL_CALL getToolTipText( ) override; // XAccessibleAction - virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleActionCount( ) override; + virtual sal_Bool SAL_CALL doAccessibleAction ( sal_Int32 nIndex ) override; + virtual OUString SAL_CALL getAccessibleActionDescription ( sal_Int32 nIndex ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleKeyBinding > SAL_CALL getAccessibleActionKeyBinding( sal_Int32 nIndex ) override; // XAccessibleValue - virtual css::uno::Any SAL_CALL getCurrentValue( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getMaximumValue( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getMinimumValue( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getCurrentValue( ) override; + virtual sal_Bool SAL_CALL setCurrentValue( const css::uno::Any& aNumber ) override; + virtual css::uno::Any SAL_CALL getMaximumValue( ) override; + virtual css::uno::Any SAL_CALL getMinimumValue( ) override; }; #endif // INCLUDED_ACCESSIBILITY_INC_STANDARD_VCLXACCESSIBLETOOLBOXITEM_HXX diff --git a/accessibility/source/extended/AccessibleBrowseBox.cxx b/accessibility/source/extended/AccessibleBrowseBox.cxx index 07baad096774..bfef475f1fe3 100644 --- a/accessibility/source/extended/AccessibleBrowseBox.cxx +++ b/accessibility/source/extended/AccessibleBrowseBox.cxx @@ -108,7 +108,6 @@ void SAL_CALL AccessibleBrowseBox::disposing() // css::accessibility::XAccessibleContext sal_Int32 SAL_CALL AccessibleBrowseBox::getAccessibleChildCount() - throw ( uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -119,7 +118,6 @@ sal_Int32 SAL_CALL AccessibleBrowseBox::getAccessibleChildCount() css::uno::Reference< css::accessibility::XAccessible > SAL_CALL AccessibleBrowseBox::getAccessibleChild( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -147,7 +145,6 @@ AccessibleBrowseBox::getAccessibleChild( sal_Int32 nChildIndex ) css::uno::Reference< css::accessibility::XAccessible > SAL_CALL AccessibleBrowseBox::getAccessibleAtPoint( const awt::Point& rPoint ) - throw ( uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -177,7 +174,6 @@ AccessibleBrowseBox::getAccessibleAtPoint( const awt::Point& rPoint ) void SAL_CALL AccessibleBrowseBox::grabFocus() - throw ( uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -188,7 +184,6 @@ void SAL_CALL AccessibleBrowseBox::grabFocus() // XServiceInfo OUString SAL_CALL AccessibleBrowseBox::getImplementationName() - throw ( uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.svtools.AccessibleBrowseBox" ); } @@ -318,7 +313,7 @@ void AccessibleBrowseBoxAccess::dispose() } -css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL AccessibleBrowseBoxAccess::getAccessibleContext() throw ( RuntimeException, std::exception ) +css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL AccessibleBrowseBoxAccess::getAccessibleContext() { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx index ccb2c3728062..3b17348b31c1 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxBase.cxx @@ -115,7 +115,6 @@ void SAL_CALL AccessibleBrowseBoxBase::disposing() // css::accessibility::XAccessibleContext Reference< css::accessibility::XAccessible > SAL_CALL AccessibleBrowseBoxBase::getAccessibleParent() - throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( getMutex() ); ensureIsAlive(); @@ -123,7 +122,6 @@ Reference< css::accessibility::XAccessible > SAL_CALL AccessibleBrowseBoxBase::g } sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getAccessibleIndexInParent() - throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( getMutex() ); ensureIsAlive(); @@ -159,7 +157,6 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getAccessibleIndexInParent() } OUString SAL_CALL AccessibleBrowseBoxBase::getAccessibleDescription() - throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( getMutex() ); ensureIsAlive(); @@ -167,7 +164,6 @@ OUString SAL_CALL AccessibleBrowseBoxBase::getAccessibleDescription() } OUString SAL_CALL AccessibleBrowseBoxBase::getAccessibleName() - throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( getMutex() ); ensureIsAlive(); @@ -176,7 +172,6 @@ OUString SAL_CALL AccessibleBrowseBoxBase::getAccessibleName() Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL AccessibleBrowseBoxBase::getAccessibleRelationSet() - throw ( uno::RuntimeException, std::exception ) { ensureIsAlive(); // BrowseBox does not have relations. @@ -185,7 +180,6 @@ AccessibleBrowseBoxBase::getAccessibleRelationSet() Reference< css::accessibility::XAccessibleStateSet > SAL_CALL AccessibleBrowseBoxBase::getAccessibleStateSet() - throw ( uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard( getMutex() ); // don't check whether alive -> StateSet may contain DEFUNC @@ -193,7 +187,6 @@ AccessibleBrowseBoxBase::getAccessibleStateSet() } lang::Locale SAL_CALL AccessibleBrowseBoxBase::getLocale() - throw ( IllegalAccessibleComponentStateException, uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( getMutex() ); ensureIsAlive(); @@ -210,36 +203,31 @@ lang::Locale SAL_CALL AccessibleBrowseBoxBase::getLocale() // css::accessibility::XAccessibleComponent sal_Bool SAL_CALL AccessibleBrowseBoxBase::containsPoint( const css::awt::Point& rPoint ) - throw ( uno::RuntimeException, std::exception ) { return Rectangle( Point(), getBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) ); } awt::Rectangle SAL_CALL AccessibleBrowseBoxBase::getBounds() - throw ( uno::RuntimeException, std::exception ) { return AWTRectangle( getBoundingBox() ); } awt::Point SAL_CALL AccessibleBrowseBoxBase::getLocation() - throw ( uno::RuntimeException, std::exception ) { return AWTPoint( getBoundingBox().TopLeft() ); } awt::Point SAL_CALL AccessibleBrowseBoxBase::getLocationOnScreen() - throw ( uno::RuntimeException, std::exception ) { return AWTPoint( getBoundingBoxOnScreen().TopLeft() ); } awt::Size SAL_CALL AccessibleBrowseBoxBase::getSize() - throw ( uno::RuntimeException, std::exception ) { return AWTSize( getBoundingBox().GetSize() ); } -void SAL_CALL AccessibleBrowseBoxBase::focusGained( const css::awt::FocusEvent& ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL AccessibleBrowseBoxBase::focusGained( const css::awt::FocusEvent& ) { com::sun::star::uno::Any aFocused; com::sun::star::uno::Any aEmpty; @@ -249,7 +237,7 @@ void SAL_CALL AccessibleBrowseBoxBase::focusGained( const css::awt::FocusEvent& } -void SAL_CALL AccessibleBrowseBoxBase::focusLost( const css::awt::FocusEvent& ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL AccessibleBrowseBoxBase::focusLost( const css::awt::FocusEvent& ) { com::sun::star::uno::Any aFocused; com::sun::star::uno::Any aEmpty; @@ -261,7 +249,6 @@ void SAL_CALL AccessibleBrowseBoxBase::focusLost( const css::awt::FocusEvent& ) void SAL_CALL AccessibleBrowseBoxBase::addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener>& _rxListener ) - throw ( uno::RuntimeException, std::exception ) { if ( _rxListener.is() ) { @@ -275,7 +262,6 @@ void SAL_CALL AccessibleBrowseBoxBase::addAccessibleEventListener( void SAL_CALL AccessibleBrowseBoxBase::removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener>& _rxListener ) - throw ( uno::RuntimeException, std::exception ) { if( _rxListener.is() && getClientId( ) ) { @@ -298,7 +284,6 @@ void SAL_CALL AccessibleBrowseBoxBase::removeAccessibleEventListener( // XTypeProvider Sequence< sal_Int8 > SAL_CALL AccessibleBrowseBoxBase::getImplementationId() - throw ( uno::RuntimeException, std::exception ) { return css::uno::Sequence(); } @@ -307,13 +292,11 @@ Sequence< sal_Int8 > SAL_CALL AccessibleBrowseBoxBase::getImplementationId() sal_Bool SAL_CALL AccessibleBrowseBoxBase::supportsService( const OUString& rServiceName ) - throw ( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL AccessibleBrowseBoxBase::getSupportedServiceNames() - throw ( uno::RuntimeException, std::exception ) { const OUString aServiceName( "com.sun.star.accessibility.AccessibleContext" ); return Sequence< OUString >( &aServiceName, 1 ); @@ -394,14 +377,12 @@ bool AccessibleBrowseBoxBase::isAlive() const } void AccessibleBrowseBoxBase::ensureIsAlive() const - throw ( lang::DisposedException ) { if( !isAlive() ) throw lang::DisposedException(); } Rectangle AccessibleBrowseBoxBase::getBoundingBox() - throw ( lang::DisposedException ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -415,7 +396,6 @@ Rectangle AccessibleBrowseBoxBase::getBoundingBox() } Rectangle AccessibleBrowseBoxBase::getBoundingBoxOnScreen() - throw ( lang::DisposedException ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -450,7 +430,6 @@ void AccessibleBrowseBoxBase::commitEvent( } sal_Int16 SAL_CALL AccessibleBrowseBoxBase::getAccessibleRole() - throw ( uno::RuntimeException, std::exception ) { ensureIsAlive(); sal_Int16 nRole = AccessibleRole::UNKNOWN; @@ -481,17 +460,16 @@ sal_Int16 SAL_CALL AccessibleBrowseBoxBase::getAccessibleRole() } Reference SAL_CALL AccessibleBrowseBoxBase::getAccessibleAtPoint( const css::awt::Point& ) - throw ( uno::RuntimeException, std::exception ) { return nullptr; } -void SAL_CALL AccessibleBrowseBoxBase::disposing( const css::lang::EventObject& ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL AccessibleBrowseBoxBase::disposing( const css::lang::EventObject& ) { m_xFocusWindow = nullptr; } -sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getForeground( ) throw (css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getForeground( ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -516,7 +494,7 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getForeground( ) throw (css::uno::R return nColor; } -sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getBackground( ) throw (css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleBrowseBoxBase::getBackground( ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -543,7 +521,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( BrowseBoxAccessibleElement, AccessibleBrowseBo // css::accessibility::XAccessible -Reference< css::accessibility::XAccessibleContext > SAL_CALL BrowseBoxAccessibleElement::getAccessibleContext() throw ( uno::RuntimeException, std::exception ) +Reference< css::accessibility::XAccessibleContext > SAL_CALL BrowseBoxAccessibleElement::getAccessibleContext() { ensureIsAlive(); return this; diff --git a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx index c8490babdcc8..da749b76fb38 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxCheckBoxCell.cxx @@ -44,7 +44,7 @@ namespace accessibility IMPLEMENT_FORWARD_XTYPEPROVIDER2( AccessibleCheckBoxCell, AccessibleBrowseBoxCell, AccessibleCheckBoxCell_BASE ) - Reference< XAccessibleContext > SAL_CALL AccessibleCheckBoxCell::getAccessibleContext( ) throw (RuntimeException, std::exception) + Reference< XAccessibleContext > SAL_CALL AccessibleCheckBoxCell::getAccessibleContext( ) { ensureIsAlive(); return this; @@ -66,7 +66,7 @@ namespace accessibility // XAccessibleValue - Any SAL_CALL AccessibleCheckBoxCell::getCurrentValue( ) throw (RuntimeException, std::exception) + Any SAL_CALL AccessibleCheckBoxCell::getCurrentValue( ) { ::osl::MutexGuard aGuard( getMutex() ); @@ -86,12 +86,12 @@ namespace accessibility return makeAny(nValue); } - sal_Bool SAL_CALL AccessibleCheckBoxCell::setCurrentValue( const Any& ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleCheckBoxCell::setCurrentValue( const Any& ) { return false; } - Any SAL_CALL AccessibleCheckBoxCell::getMaximumValue( ) throw (RuntimeException, std::exception) + Any SAL_CALL AccessibleCheckBoxCell::getMaximumValue( ) { ::osl::MutexGuard aGuard( getMutex() ); @@ -105,7 +105,7 @@ namespace accessibility return aValue; } - Any SAL_CALL AccessibleCheckBoxCell::getMinimumValue( ) throw (RuntimeException, std::exception) + Any SAL_CALL AccessibleCheckBoxCell::getMinimumValue( ) { Any aValue; aValue <<= (sal_Int32) 0; @@ -114,23 +114,22 @@ namespace accessibility } // XAccessibleContext - sal_Int32 SAL_CALL AccessibleCheckBoxCell::getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleCheckBoxCell::getAccessibleChildCount( ) { return 0; } - css::uno::Reference< css::accessibility::XAccessible > SAL_CALL AccessibleCheckBoxCell::getAccessibleChild( sal_Int32 ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) + css::uno::Reference< css::accessibility::XAccessible > SAL_CALL AccessibleCheckBoxCell::getAccessibleChild( sal_Int32 ) { throw css::lang::IndexOutOfBoundsException(); } - OUString SAL_CALL AccessibleCheckBoxCell::getImplementationName() throw ( css::uno::RuntimeException, std::exception ) + OUString SAL_CALL AccessibleCheckBoxCell::getImplementationName() { return OUString( "com.sun.star.comp.svtools.TableCheckBoxCell" ); } sal_Int32 SAL_CALL AccessibleCheckBoxCell::getAccessibleIndexInParent() - throw ( css::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( getMutex() ); diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx index cd9ce964e298..00d04c7756e1 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderBar.cxx @@ -54,7 +54,6 @@ AccessibleBrowseBoxHeaderBar::~AccessibleBrowseBoxHeaderBar() Reference< XAccessible > SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleChild( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -64,7 +63,6 @@ AccessibleBrowseBoxHeaderBar::getAccessibleChild( sal_Int32 nChildIndex ) } sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleIndexInParent() - throw ( uno::RuntimeException, std::exception ) { return isRowBar() ? BBINDEX_ROWHEADERBAR : BBINDEX_COLUMNHEADERBAR; } @@ -73,7 +71,6 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleIndexInParent() Reference< XAccessible > SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleAtPoint( const awt::Point& rPoint ) - throw ( uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -88,7 +85,6 @@ AccessibleBrowseBoxHeaderBar::getAccessibleAtPoint( const awt::Point& rPoint ) } void SAL_CALL AccessibleBrowseBoxHeaderBar::grabFocus() - throw ( uno::RuntimeException, std::exception ) { ensureIsAlive(); // focus on header not supported @@ -97,7 +93,6 @@ void SAL_CALL AccessibleBrowseBoxHeaderBar::grabFocus() // XAccessibleTable ----------------------------------------------------------- OUString SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleRowDescription( sal_Int32 nRow ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); @@ -107,7 +102,6 @@ OUString SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleRowDescription( sal } OUString SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleColumnDescription( sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); @@ -117,21 +111,18 @@ OUString SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleColumnDescription( } Reference< XAccessibleTable > SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleRowHeaders() - throw ( uno::RuntimeException, std::exception ) { ensureIsAlive(); return nullptr; // no headers in headers } Reference< XAccessibleTable > SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleColumnHeaders() - throw ( uno::RuntimeException, std::exception ) { ensureIsAlive(); return nullptr; // no headers in headers } Sequence< sal_Int32 > SAL_CALL AccessibleBrowseBoxHeaderBar::getSelectedAccessibleRows() - throw ( uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -144,7 +135,6 @@ Sequence< sal_Int32 > SAL_CALL AccessibleBrowseBoxHeaderBar::getSelectedAccessib } Sequence< sal_Int32 > SAL_CALL AccessibleBrowseBoxHeaderBar::getSelectedAccessibleColumns() - throw ( uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -157,7 +147,6 @@ Sequence< sal_Int32 > SAL_CALL AccessibleBrowseBoxHeaderBar::getSelectedAccessib } sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleRowSelected( sal_Int32 nRow ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); @@ -167,7 +156,6 @@ sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleRowSelected( sal_Int } sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleColumnSelected( sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); @@ -178,7 +166,6 @@ sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleColumnSelected( sal_ Reference< XAccessible > SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); @@ -190,7 +177,6 @@ Reference< XAccessible > SAL_CALL AccessibleBrowseBoxHeaderBar::getAccessibleCel sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -202,7 +188,6 @@ sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleSelected( // XAccessibleSelection ------------------------------------------------------- void SAL_CALL AccessibleBrowseBoxHeaderBar::selectAccessibleChild( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -215,7 +200,6 @@ void SAL_CALL AccessibleBrowseBoxHeaderBar::selectAccessibleChild( sal_Int32 nCh } sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleChildSelected( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { // using interface methods - no mutex return isRowBar() ? @@ -224,7 +208,6 @@ sal_Bool SAL_CALL AccessibleBrowseBoxHeaderBar::isAccessibleChildSelected( sal_I } void SAL_CALL AccessibleBrowseBoxHeaderBar::clearAccessibleSelection() - throw ( uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -233,7 +216,6 @@ void SAL_CALL AccessibleBrowseBoxHeaderBar::clearAccessibleSelection() } void SAL_CALL AccessibleBrowseBoxHeaderBar::selectAllAccessibleChildren() - throw ( uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -246,7 +228,6 @@ void SAL_CALL AccessibleBrowseBoxHeaderBar::selectAllAccessibleChildren() } sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderBar::getSelectedAccessibleChildCount() - throw ( uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -256,7 +237,6 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderBar::getSelectedAccessibleChildCount Reference< XAccessible > SAL_CALL AccessibleBrowseBoxHeaderBar::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -268,7 +248,6 @@ AccessibleBrowseBoxHeaderBar::getSelectedAccessibleChild( sal_Int32 nSelectedChi void SAL_CALL AccessibleBrowseBoxHeaderBar::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -286,7 +265,6 @@ void SAL_CALL AccessibleBrowseBoxHeaderBar::deselectAccessibleChild( // XInterface ----------------------------------------------------------------- Any SAL_CALL AccessibleBrowseBoxHeaderBar::queryInterface( const uno::Type& rType ) - throw ( uno::RuntimeException, std::exception ) { Any aAny( AccessibleBrowseBoxTableBase::queryInterface( rType ) ); return aAny.hasValue() ? @@ -306,13 +284,11 @@ void SAL_CALL AccessibleBrowseBoxHeaderBar::release() throw () // XServiceInfo --------------------------------------------------------------- OUString SAL_CALL AccessibleBrowseBoxHeaderBar::getImplementationName() - throw ( uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.svtools.AccessibleBrowseBoxHeaderBar" ); } Sequence< sal_Int8 > SAL_CALL AccessibleBrowseBoxHeaderBar::getImplementationId() - throw ( uno::RuntimeException, std::exception ) { return css::uno::Sequence(); } @@ -353,7 +329,6 @@ Reference< XAccessible > AccessibleBrowseBoxHeaderBar::implGetChild( sal_Int32 AccessibleBrowseBoxHeaderBar::implGetChildIndexFromSelectedIndex( sal_Int32 nSelectedChildIndex ) - throw ( lang::IndexOutOfBoundsException ) { Sequence< sal_Int32 > aSelSeq; if( isRowBar() ) @@ -368,7 +343,6 @@ sal_Int32 AccessibleBrowseBoxHeaderBar::implGetChildIndexFromSelectedIndex( } void AccessibleBrowseBoxHeaderBar::ensureIsValidHeaderIndex( sal_Int32 nIndex ) - throw ( lang::IndexOutOfBoundsException ) { if( isRowBar() ) ensureIsValidRow( nIndex ); diff --git a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx index 2f706338a75c..ce5c3ef7f3f4 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxHeaderCell.cxx @@ -81,7 +81,6 @@ AccessibleBrowseBoxHeaderCell::AccessibleBrowseBoxHeaderCell(sal_Int32 _nColumnR The count of visible children. */ sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleChildCount() - throw ( RuntimeException, std::exception ) { return 0; } @@ -91,7 +90,6 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleChildCount() The XAccessible interface of the specified child. */ Reference SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleChild( sal_Int32 ) - throw ( IndexOutOfBoundsException,RuntimeException, std::exception ) { throw IndexOutOfBoundsException(); } @@ -99,7 +97,6 @@ Reference SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleChi /** Grabs the focus to the column header. */ void SAL_CALL AccessibleBrowseBoxHeaderCell::grabFocus() - throw ( css::uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -114,7 +111,6 @@ void SAL_CALL AccessibleBrowseBoxHeaderCell::grabFocus() The name of this class. */ OUString SAL_CALL AccessibleBrowseBoxHeaderCell::getImplementationName() - throw ( css::uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.svtools.AccessibleBrowseBoxHeaderCell" ); } @@ -148,7 +144,6 @@ Rectangle AccessibleBrowseBoxHeaderCell::implGetBoundingBoxOnScreen() } sal_Int32 SAL_CALL AccessibleBrowseBoxHeaderCell::getAccessibleIndexInParent() - throw ( RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( getMutex() ); ensureIsAlive(); diff --git a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx index 756146d0792d..61d7c2b21773 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTable.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTable.cxx @@ -49,7 +49,6 @@ AccessibleBrowseBoxTable::~AccessibleBrowseBoxTable() Reference< XAccessible > SAL_CALL AccessibleBrowseBoxTable::getAccessibleChild( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -60,7 +59,6 @@ AccessibleBrowseBoxTable::getAccessibleChild( sal_Int32 nChildIndex ) } sal_Int32 SAL_CALL AccessibleBrowseBoxTable::getAccessibleIndexInParent() - throw ( uno::RuntimeException, std::exception ) { ensureIsAlive(); return BBINDEX_TABLE; @@ -70,7 +68,6 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxTable::getAccessibleIndexInParent() Reference< XAccessible > SAL_CALL AccessibleBrowseBoxTable::getAccessibleAtPoint( const awt::Point& rPoint ) - throw ( uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -85,7 +82,6 @@ AccessibleBrowseBoxTable::getAccessibleAtPoint( const awt::Point& rPoint ) } void SAL_CALL AccessibleBrowseBoxTable::grabFocus() - throw ( uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -95,7 +91,6 @@ void SAL_CALL AccessibleBrowseBoxTable::grabFocus() // XAccessibleTable ----------------------------------------------------------- OUString SAL_CALL AccessibleBrowseBoxTable::getAccessibleRowDescription( sal_Int32 nRow ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -104,7 +99,6 @@ OUString SAL_CALL AccessibleBrowseBoxTable::getAccessibleRowDescription( sal_Int } OUString SAL_CALL AccessibleBrowseBoxTable::getAccessibleColumnDescription( sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -114,7 +108,6 @@ OUString SAL_CALL AccessibleBrowseBoxTable::getAccessibleColumnDescription( sal_ } Reference< XAccessibleTable > SAL_CALL AccessibleBrowseBoxTable::getAccessibleRowHeaders() - throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( getMutex() ); ensureIsAlive(); @@ -122,7 +115,6 @@ Reference< XAccessibleTable > SAL_CALL AccessibleBrowseBoxTable::getAccessibleRo } Reference< XAccessibleTable > SAL_CALL AccessibleBrowseBoxTable::getAccessibleColumnHeaders() - throw ( uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( getMutex() ); ensureIsAlive(); @@ -130,7 +122,6 @@ Reference< XAccessibleTable > SAL_CALL AccessibleBrowseBoxTable::getAccessibleCo } Sequence< sal_Int32 > SAL_CALL AccessibleBrowseBoxTable::getSelectedAccessibleRows() - throw ( uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -141,7 +132,6 @@ Sequence< sal_Int32 > SAL_CALL AccessibleBrowseBoxTable::getSelectedAccessibleRo } Sequence< sal_Int32 > SAL_CALL AccessibleBrowseBoxTable::getSelectedAccessibleColumns() - throw ( uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -152,7 +142,6 @@ Sequence< sal_Int32 > SAL_CALL AccessibleBrowseBoxTable::getSelectedAccessibleCo } sal_Bool SAL_CALL AccessibleBrowseBoxTable::isAccessibleRowSelected( sal_Int32 nRow ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -162,7 +151,6 @@ sal_Bool SAL_CALL AccessibleBrowseBoxTable::isAccessibleRowSelected( sal_Int32 n } sal_Bool SAL_CALL AccessibleBrowseBoxTable::isAccessibleColumnSelected( sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -173,7 +161,6 @@ sal_Bool SAL_CALL AccessibleBrowseBoxTable::isAccessibleColumnSelected( sal_Int3 Reference< XAccessible > SAL_CALL AccessibleBrowseBoxTable::getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -184,7 +171,6 @@ Reference< XAccessible > SAL_CALL AccessibleBrowseBoxTable::getAccessibleCellAt( sal_Bool SAL_CALL AccessibleBrowseBoxTable::isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -196,7 +182,6 @@ sal_Bool SAL_CALL AccessibleBrowseBoxTable::isAccessibleSelected( // XServiceInfo --------------------------------------------------------------- OUString SAL_CALL AccessibleBrowseBoxTable::getImplementationName() - throw ( uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.svtools.AccessibleBrowseBoxTable" ); } @@ -217,7 +202,6 @@ Rectangle AccessibleBrowseBoxTable::implGetBoundingBoxOnScreen() Reference< XAccessibleTable > AccessibleBrowseBoxTable::implGetHeaderBar( sal_Int32 nChildIndex ) - throw ( uno::RuntimeException ) { Reference< XAccessible > xRet; Reference< XAccessibleContext > xContext( mxParent, uno::UNO_QUERY ); diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx index 153ff855716a..f862854379b8 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTableBase.cxx @@ -53,7 +53,6 @@ AccessibleBrowseBoxTableBase::~AccessibleBrowseBoxTableBase() // XAccessibleContext --------------------------------------------------------- sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleChildCount() - throw ( uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -61,7 +60,6 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleChildCount() } sal_Int16 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleRole() - throw ( uno::RuntimeException, std::exception ) { ensureIsAlive(); return AccessibleRole::TABLE; @@ -70,7 +68,6 @@ sal_Int16 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleRole() // XAccessibleTable ----------------------------------------------------------- sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleRowCount() - throw ( uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -78,7 +75,6 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleRowCount() } sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleColumnCount() - throw ( uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -87,7 +83,6 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleColumnCount() sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -97,7 +92,6 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleRowExtentAt( sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -106,14 +100,12 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleColumnExtentAt( } Reference< XAccessible > SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleCaption() - throw ( uno::RuntimeException, std::exception ) { ensureIsAlive(); return nullptr; // not supported } Reference< XAccessible > SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleSummary() - throw ( uno::RuntimeException, std::exception ) { ensureIsAlive(); return nullptr; // not supported @@ -121,7 +113,6 @@ Reference< XAccessible > SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleSum sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -130,7 +121,6 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleIndex( } sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleRow( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -139,7 +129,6 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleRow( sal_Int32 nCh } sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleColumn( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -150,7 +139,6 @@ sal_Int32 SAL_CALL AccessibleBrowseBoxTableBase::getAccessibleColumn( sal_Int32 // XInterface ----------------------------------------------------------------- Any SAL_CALL AccessibleBrowseBoxTableBase::queryInterface( const uno::Type& rType ) - throw ( uno::RuntimeException, std::exception ) { Any aAny( BrowseBoxAccessibleElement::queryInterface( rType ) ); return aAny.hasValue() ? @@ -170,7 +158,6 @@ void SAL_CALL AccessibleBrowseBoxTableBase::release() throw () // XTypeProvider -------------------------------------------------------------- Sequence< uno::Type > SAL_CALL AccessibleBrowseBoxTableBase::getTypes() - throw ( uno::RuntimeException, std::exception ) { return ::comphelper::concatSequences( BrowseBoxAccessibleElement::getTypes(), @@ -178,7 +165,6 @@ Sequence< uno::Type > SAL_CALL AccessibleBrowseBoxTableBase::getTypes() } Sequence< sal_Int8 > SAL_CALL AccessibleBrowseBoxTableBase::getImplementationId() - throw ( uno::RuntimeException, std::exception ) { return css::uno::Sequence(); } @@ -279,7 +265,6 @@ void AccessibleBrowseBoxTableBase::implGetSelectedColumns( Sequence< sal_Int32 > } void AccessibleBrowseBoxTableBase::ensureIsValidRow( sal_Int32 nRow ) - throw ( lang::IndexOutOfBoundsException ) { if( nRow >= implGetRowCount() ) throw lang::IndexOutOfBoundsException( @@ -287,7 +272,6 @@ void AccessibleBrowseBoxTableBase::ensureIsValidRow( sal_Int32 nRow ) } void AccessibleBrowseBoxTableBase::ensureIsValidColumn( sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException ) { if( nColumn >= implGetColumnCount() ) throw lang::IndexOutOfBoundsException( @@ -296,14 +280,12 @@ void AccessibleBrowseBoxTableBase::ensureIsValidColumn( sal_Int32 nColumn ) void AccessibleBrowseBoxTableBase::ensureIsValidAddress( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException ) { ensureIsValidRow( nRow ); ensureIsValidColumn( nColumn ); } void AccessibleBrowseBoxTableBase::ensureIsValidIndex( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException ) { if( nChildIndex >= implGetChildCount() ) throw lang::IndexOutOfBoundsException( diff --git a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx index edf942981311..ea8f6694d290 100644 --- a/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx +++ b/accessibility/source/extended/AccessibleBrowseBoxTableCell.cxx @@ -28,7 +28,7 @@ namespace accessibility namespace { /// @throws css::lang::IndexOutOfBoundsException - void checkIndex_Impl( sal_Int32 _nIndex, const OUString& _sText ) throw (css::lang::IndexOutOfBoundsException) + void checkIndex_Impl( sal_Int32 _nIndex, const OUString& _sText ) { if ( _nIndex >= _sText.getLength() ) throw css::lang::IndexOutOfBoundsException(); @@ -98,7 +98,6 @@ namespace accessibility /** Queries for a new interface. */ css::uno::Any SAL_CALL AccessibleBrowseBoxTableCell::queryInterface( const css::uno::Type& rType ) - throw ( css::uno::RuntimeException, std::exception ) { Any aRet = AccessibleBrowseBoxCell::queryInterface(rType); if ( !aRet.hasValue() ) @@ -118,7 +117,7 @@ namespace accessibility AccessibleBrowseBoxCell::release(); } - css::awt::Rectangle SAL_CALL AccessibleBrowseBoxTableCell::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + css::awt::Rectangle SAL_CALL AccessibleBrowseBoxTableCell::getCharacterBounds( sal_Int32 nIndex ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -136,7 +135,7 @@ namespace accessibility return aRect; } - sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getIndexAtPoint( const css::awt::Point& _aPoint ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getIndexAtPoint( const css::awt::Point& _aPoint ) { //! TODO CTL bidi // OSL_FAIL("Need to be done by base class!"); @@ -150,14 +149,12 @@ namespace accessibility The name of this class. */ OUString SAL_CALL AccessibleBrowseBoxTableCell::getImplementationName() - throw ( css::uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.comp.svtools.AccessibleBrowseBoxTableCell" ); } /** @return The count of visible children. */ sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getAccessibleChildCount() - throw ( css::uno::RuntimeException, std::exception ) { return 0; } @@ -165,8 +162,6 @@ namespace accessibility /** @return The XAccessible interface of the specified child. */ css::uno::Reference< css::accessibility::XAccessible > SAL_CALL AccessibleBrowseBoxTableCell::getAccessibleChild( sal_Int32 ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) { throw css::lang::IndexOutOfBoundsException(); } @@ -200,7 +195,7 @@ namespace accessibility // XAccessible ------------------------------------------------------------ /** @return The XAccessibleContext interface of this object. */ - Reference< XAccessibleContext > SAL_CALL AccessibleBrowseBoxTableCell::getAccessibleContext() throw ( RuntimeException, std::exception ) + Reference< XAccessibleContext > SAL_CALL AccessibleBrowseBoxTableCell::getAccessibleContext() { ensureIsAlive(); return this; @@ -209,7 +204,6 @@ namespace accessibility // XAccessibleContext ----------------------------------------------------- sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getAccessibleIndexInParent() - throw ( css::uno::RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -217,12 +211,12 @@ namespace accessibility return /*BBINDEX_FIRSTCONTROL*/ m_nOffset + ( getRowPos() * mpBrowseBox->GetColumnCount() ) + getColumnPos(); } - sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getCaretPosition( ) throw (css::uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getCaretPosition( ) { return -1; } - sal_Bool SAL_CALL AccessibleBrowseBoxTableCell::setCaretPosition ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleBrowseBoxTableCell::setCaretPosition ( sal_Int32 nIndex ) { SolarMethodGuard aGuard(getMutex()); @@ -231,13 +225,13 @@ namespace accessibility return false; } - sal_Unicode SAL_CALL AccessibleBrowseBoxTableCell::getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) + sal_Unicode SAL_CALL AccessibleBrowseBoxTableCell::getCharacter( sal_Int32 nIndex ) { SolarMethodGuard aGuard(getMutex()); return OCommonAccessibleText::getCharacter( nIndex ); } - css::uno::Sequence< css::beans::PropertyValue > SAL_CALL AccessibleBrowseBoxTableCell::getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) + css::uno::Sequence< css::beans::PropertyValue > SAL_CALL AccessibleBrowseBoxTableCell::getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& ) { SolarMethodGuard aGuard(getMutex()); @@ -248,32 +242,32 @@ namespace accessibility return css::uno::Sequence< css::beans::PropertyValue >(); } - sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getCharacterCount( ) throw (css::uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getCharacterCount( ) { SolarMethodGuard aGuard(getMutex()); return OCommonAccessibleText::getCharacterCount( ); } - OUString SAL_CALL AccessibleBrowseBoxTableCell::getSelectedText( ) throw (css::uno::RuntimeException, std::exception) + OUString SAL_CALL AccessibleBrowseBoxTableCell::getSelectedText( ) { SolarMethodGuard aGuard(getMutex()); return OCommonAccessibleText::getSelectedText( ); } - sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getSelectionStart( ) throw (css::uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getSelectionStart( ) { SolarMethodGuard aGuard(getMutex()); return OCommonAccessibleText::getSelectionStart( ); } - sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getSelectionEnd( ) throw (css::uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleBrowseBoxTableCell::getSelectionEnd( ) { SolarMethodGuard aGuard(getMutex()); return OCommonAccessibleText::getSelectionEnd( ); } - sal_Bool SAL_CALL AccessibleBrowseBoxTableCell::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleBrowseBoxTableCell::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { SolarMethodGuard aGuard(getMutex()); @@ -282,37 +276,37 @@ namespace accessibility return false; } - OUString SAL_CALL AccessibleBrowseBoxTableCell::getText( ) throw (css::uno::RuntimeException, std::exception) + OUString SAL_CALL AccessibleBrowseBoxTableCell::getText( ) { SolarMethodGuard aGuard(getMutex()); return OCommonAccessibleText::getText( ); } - OUString SAL_CALL AccessibleBrowseBoxTableCell::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) + OUString SAL_CALL AccessibleBrowseBoxTableCell::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { SolarMethodGuard aGuard(getMutex()); return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex ); } - css::accessibility::TextSegment SAL_CALL AccessibleBrowseBoxTableCell::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) + css::accessibility::TextSegment SAL_CALL AccessibleBrowseBoxTableCell::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { SolarMethodGuard aGuard(getMutex()); return OCommonAccessibleText::getTextAtIndex( nIndex ,aTextType); } - css::accessibility::TextSegment SAL_CALL AccessibleBrowseBoxTableCell::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) + css::accessibility::TextSegment SAL_CALL AccessibleBrowseBoxTableCell::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { SolarMethodGuard aGuard(getMutex()); return OCommonAccessibleText::getTextBeforeIndex( nIndex ,aTextType); } - css::accessibility::TextSegment SAL_CALL AccessibleBrowseBoxTableCell::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) + css::accessibility::TextSegment SAL_CALL AccessibleBrowseBoxTableCell::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { SolarMethodGuard aGuard(getMutex()); return OCommonAccessibleText::getTextBehindIndex( nIndex ,aTextType); } - sal_Bool SAL_CALL AccessibleBrowseBoxTableCell::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleBrowseBoxTableCell::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { SolarMethodGuard aGuard(getMutex()); @@ -323,7 +317,7 @@ namespace accessibility //!!! don't know how to put a string into the clipboard return false; } - void AccessibleBrowseBoxTableCell::disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception) + void AccessibleBrowseBoxTableCell::disposing( const EventObject& _rSource ) { if ( _rSource.Source == mxParent ) { diff --git a/accessibility/source/extended/AccessibleGridControl.cxx b/accessibility/source/extended/AccessibleGridControl.cxx index 1203e9a7576f..d95a19e83117 100644 --- a/accessibility/source/extended/AccessibleGridControl.cxx +++ b/accessibility/source/extended/AccessibleGridControl.cxx @@ -108,7 +108,6 @@ void SAL_CALL AccessibleGridControl::disposing() // css::accessibility::XAccessibleContext --------------------------------------------------------- sal_Int32 SAL_CALL AccessibleGridControl::getAccessibleChildCount() - throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ensureIsAlive(); @@ -118,7 +117,6 @@ sal_Int32 SAL_CALL AccessibleGridControl::getAccessibleChildCount() css::uno::Reference< css::accessibility::XAccessible > SAL_CALL AccessibleGridControl::getAccessibleChild( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -158,7 +156,6 @@ AccessibleGridControl::getAccessibleChild( sal_Int32 nChildIndex ) sal_Int16 SAL_CALL AccessibleGridControl::getAccessibleRole() - throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -171,7 +168,6 @@ sal_Int16 SAL_CALL AccessibleGridControl::getAccessibleRole() css::uno::Reference< css::accessibility::XAccessible > SAL_CALL AccessibleGridControl::getAccessibleAtPoint( const awt::Point& rPoint ) - throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ensureIsAlive(); @@ -201,7 +197,6 @@ AccessibleGridControl::getAccessibleAtPoint( const awt::Point& rPoint ) void SAL_CALL AccessibleGridControl::grabFocus() - throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ensureIsAlive(); @@ -211,7 +206,6 @@ void SAL_CALL AccessibleGridControl::grabFocus() // XServiceInfo --------------------------------------------------------------- OUString SAL_CALL AccessibleGridControl::getImplementationName() - throw ( uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.accessibility.AccessibleGridControl" ); } @@ -405,7 +399,7 @@ void AccessibleGridControlAccess::DisposeAccessImpl() } -css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL AccessibleGridControlAccess::getAccessibleContext() throw ( RuntimeException, std::exception ) +css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL AccessibleGridControlAccess::getAccessibleContext() { SolarMutexGuard g; diff --git a/accessibility/source/extended/AccessibleGridControlBase.cxx b/accessibility/source/extended/AccessibleGridControlBase.cxx index 74d421416ea4..8e3d81df9d53 100644 --- a/accessibility/source/extended/AccessibleGridControlBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlBase.cxx @@ -84,7 +84,6 @@ void SAL_CALL AccessibleGridControlBase::disposing() // css::accessibility::XAccessibleContext css::uno::Reference< css::accessibility::XAccessible > SAL_CALL AccessibleGridControlBase::getAccessibleParent() - throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -93,7 +92,6 @@ css::uno::Reference< css::accessibility::XAccessible > SAL_CALL AccessibleGridCo } sal_Int32 SAL_CALL AccessibleGridControlBase::getAccessibleIndexInParent() - throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -129,7 +127,6 @@ sal_Int32 SAL_CALL AccessibleGridControlBase::getAccessibleIndexInParent() } OUString SAL_CALL AccessibleGridControlBase::getAccessibleDescription() - throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -138,7 +135,6 @@ OUString SAL_CALL AccessibleGridControlBase::getAccessibleDescription() } OUString SAL_CALL AccessibleGridControlBase::getAccessibleName() - throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -148,7 +144,6 @@ OUString SAL_CALL AccessibleGridControlBase::getAccessibleName() css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL AccessibleGridControlBase::getAccessibleRelationSet() - throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -159,7 +154,6 @@ AccessibleGridControlBase::getAccessibleRelationSet() css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL AccessibleGridControlBase::getAccessibleStateSet() - throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -168,7 +162,6 @@ AccessibleGridControlBase::getAccessibleStateSet() } lang::Locale SAL_CALL AccessibleGridControlBase::getLocale() - throw ( IllegalAccessibleComponentStateException, uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -186,31 +179,26 @@ lang::Locale SAL_CALL AccessibleGridControlBase::getLocale() // css::accessibility::XAccessibleComponent sal_Bool SAL_CALL AccessibleGridControlBase::containsPoint( const awt::Point& rPoint ) - throw ( uno::RuntimeException, std::exception ) { return Rectangle( Point(), getBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) ); } awt::Rectangle SAL_CALL AccessibleGridControlBase::getBounds() - throw ( uno::RuntimeException, std::exception ) { return AWTRectangle( getBoundingBox() ); } awt::Point SAL_CALL AccessibleGridControlBase::getLocation() - throw ( uno::RuntimeException, std::exception ) { return AWTPoint( getBoundingBox().TopLeft() ); } awt::Point SAL_CALL AccessibleGridControlBase::getLocationOnScreen() - throw ( uno::RuntimeException, std::exception ) { return AWTPoint( getBoundingBoxOnScreen().TopLeft() ); } awt::Size SAL_CALL AccessibleGridControlBase::getSize() - throw ( uno::RuntimeException, std::exception ) { return AWTSize( getBoundingBox().GetSize() ); } @@ -219,7 +207,6 @@ awt::Size SAL_CALL AccessibleGridControlBase::getSize() void SAL_CALL AccessibleGridControlBase::addAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener>& _rxListener ) - throw ( uno::RuntimeException, std::exception ) { if ( _rxListener.is() ) { @@ -234,7 +221,6 @@ void SAL_CALL AccessibleGridControlBase::addAccessibleEventListener( void SAL_CALL AccessibleGridControlBase::removeAccessibleEventListener( const css::uno::Reference< css::accessibility::XAccessibleEventListener>& _rxListener ) - throw ( uno::RuntimeException, std::exception ) { if( _rxListener.is() && getClientId( ) ) { @@ -257,7 +243,6 @@ void SAL_CALL AccessibleGridControlBase::removeAccessibleEventListener( // XTypeProvider Sequence< sal_Int8 > SAL_CALL AccessibleGridControlBase::getImplementationId() - throw ( uno::RuntimeException, std::exception ) { return css::uno::Sequence(); } @@ -266,13 +251,11 @@ Sequence< sal_Int8 > SAL_CALL AccessibleGridControlBase::getImplementationId() sal_Bool SAL_CALL AccessibleGridControlBase::supportsService( const OUString& rServiceName ) - throw ( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } Sequence< OUString > SAL_CALL AccessibleGridControlBase::getSupportedServiceNames() - throw ( uno::RuntimeException, std::exception ) { return { "com.sun.star.accessibility.AccessibleContext" }; } @@ -319,14 +302,12 @@ bool AccessibleGridControlBase::isAlive() const } void AccessibleGridControlBase::ensureIsAlive() const - throw ( lang::DisposedException ) { if( !isAlive() ) throw lang::DisposedException(); } Rectangle AccessibleGridControlBase::getBoundingBox() - throw ( lang::DisposedException ) { SolarMutexGuard aSolarGuard; ensureIsAlive(); @@ -339,7 +320,6 @@ Rectangle AccessibleGridControlBase::getBoundingBox() } Rectangle AccessibleGridControlBase::getBoundingBoxOnScreen() - throw ( lang::DisposedException ) { SolarMutexGuard aSolarGuard; ensureIsAlive(); @@ -374,7 +354,6 @@ void AccessibleGridControlBase::commitEvent( } sal_Int16 SAL_CALL AccessibleGridControlBase::getAccessibleRole() - throw ( uno::RuntimeException, std::exception ) { ensureIsAlive(); sal_Int16 nRole = AccessibleRole::UNKNOWN; @@ -402,12 +381,11 @@ sal_Int16 SAL_CALL AccessibleGridControlBase::getAccessibleRole() } css::uno::Reference SAL_CALL AccessibleGridControlBase::getAccessibleAtPoint( const css::awt::Point& ) - throw ( uno::RuntimeException, std::exception ) { return nullptr; } -sal_Int32 SAL_CALL AccessibleGridControlBase::getForeground( ) throw (css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleGridControlBase::getForeground( ) { SolarMutexGuard aSolarGuard; @@ -432,7 +410,7 @@ sal_Int32 SAL_CALL AccessibleGridControlBase::getForeground( ) throw (css::uno: return nColor; } -sal_Int32 SAL_CALL AccessibleGridControlBase::getBackground( ) throw (css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL AccessibleGridControlBase::getBackground( ) { SolarMutexGuard aSolarGuard; @@ -465,7 +443,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( GridControlAccessibleElement, AccessibleGridCo // css::accessibility::XAccessible -css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL GridControlAccessibleElement::getAccessibleContext() throw ( uno::RuntimeException, std::exception ) +css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL GridControlAccessibleElement::getAccessibleContext() { SolarMutexGuard g; diff --git a/accessibility/source/extended/AccessibleGridControlHeader.cxx b/accessibility/source/extended/AccessibleGridControlHeader.cxx index c8d5c5551f2f..f3786228c4f5 100644 --- a/accessibility/source/extended/AccessibleGridControlHeader.cxx +++ b/accessibility/source/extended/AccessibleGridControlHeader.cxx @@ -56,7 +56,6 @@ AccessibleGridControlHeader::~AccessibleGridControlHeader() Reference< XAccessible > SAL_CALL AccessibleGridControlHeader::getAccessibleChild( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -78,7 +77,6 @@ AccessibleGridControlHeader::getAccessibleChild( sal_Int32 nChildIndex ) } sal_Int32 SAL_CALL AccessibleGridControlHeader::getAccessibleIndexInParent() - throw ( uno::RuntimeException, std::exception ) { ensureIsAlive(); if(m_eObjType == svt::table::TCTYPE_ROWHEADERBAR && m_aTable.HasColHeader()) @@ -91,7 +89,6 @@ sal_Int32 SAL_CALL AccessibleGridControlHeader::getAccessibleIndexInParent() Reference< XAccessible > SAL_CALL AccessibleGridControlHeader::getAccessibleAtPoint( const awt::Point& rPoint ) - throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -104,7 +101,6 @@ AccessibleGridControlHeader::getAccessibleAtPoint( const awt::Point& rPoint ) } void SAL_CALL AccessibleGridControlHeader::grabFocus() - throw ( uno::RuntimeException, std::exception ) { ensureIsAlive(); // focus on header not supported @@ -113,7 +109,6 @@ void SAL_CALL AccessibleGridControlHeader::grabFocus() // XAccessibleTable ----------------------------------------------------------- OUString SAL_CALL AccessibleGridControlHeader::getAccessibleRowDescription( sal_Int32 nRow ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -123,7 +118,6 @@ OUString SAL_CALL AccessibleGridControlHeader::getAccessibleRowDescription( sal_ } OUString SAL_CALL AccessibleGridControlHeader::getAccessibleColumnDescription( sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -133,7 +127,6 @@ OUString SAL_CALL AccessibleGridControlHeader::getAccessibleColumnDescription( s } Reference< XAccessibleTable > SAL_CALL AccessibleGridControlHeader::getAccessibleRowHeaders() - throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -142,7 +135,6 @@ Reference< XAccessibleTable > SAL_CALL AccessibleGridControlHeader::getAccessibl } Reference< XAccessibleTable > SAL_CALL AccessibleGridControlHeader::getAccessibleColumnHeaders() - throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -151,27 +143,23 @@ Reference< XAccessibleTable > SAL_CALL AccessibleGridControlHeader::getAccessibl } //not selectable Sequence< sal_Int32 > SAL_CALL AccessibleGridControlHeader::getSelectedAccessibleRows() - throw ( uno::RuntimeException, std::exception ) { Sequence< sal_Int32 > aSelSeq(0); return aSelSeq; } //columns aren't selectable Sequence< sal_Int32 > SAL_CALL AccessibleGridControlHeader::getSelectedAccessibleColumns() - throw ( uno::RuntimeException, std::exception ) { Sequence< sal_Int32 > aSelSeq(0); return aSelSeq; } //row headers not selectable sal_Bool SAL_CALL AccessibleGridControlHeader::isAccessibleRowSelected( sal_Int32 /*nRow*/ ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { return false; } //columns aren't selectable sal_Bool SAL_CALL AccessibleGridControlHeader::isAccessibleColumnSelected( sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { (void)nColumn; return false; @@ -179,14 +167,12 @@ sal_Bool SAL_CALL AccessibleGridControlHeader::isAccessibleColumnSelected( sal_I //not implemented Reference< XAccessible > SAL_CALL AccessibleGridControlHeader::getAccessibleCellAt( sal_Int32 /*nRow*/, sal_Int32 /*nColumn*/ ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { return nullptr; } // not selectable sal_Bool SAL_CALL AccessibleGridControlHeader::isAccessibleSelected( sal_Int32 /*nRow*/, sal_Int32 /*nColumn */) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { return false; } @@ -194,13 +180,11 @@ sal_Bool SAL_CALL AccessibleGridControlHeader::isAccessibleSelected( // XServiceInfo --------------------------------------------------------------- OUString SAL_CALL AccessibleGridControlHeader::getImplementationName() - throw ( uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.accessibility.AccessibleGridControlHeader" ); } Sequence< sal_Int8 > SAL_CALL AccessibleGridControlHeader::getImplementationId() - throw ( uno::RuntimeException, std::exception ) { return css::uno::Sequence(); } diff --git a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx index 8d9825936692..49a84aa0d356 100644 --- a/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx +++ b/accessibility/source/extended/AccessibleGridControlHeaderCell.cxx @@ -72,7 +72,6 @@ AccessibleGridControlHeaderCell::AccessibleGridControlHeaderCell(sal_Int32 _nCol The count of visible children. */ sal_Int32 SAL_CALL AccessibleGridControlHeaderCell::getAccessibleChildCount() - throw ( RuntimeException, std::exception ) { return 0; } @@ -82,7 +81,6 @@ sal_Int32 SAL_CALL AccessibleGridControlHeaderCell::getAccessibleChildCount() The XAccessible interface of the specified child. */ Reference SAL_CALL AccessibleGridControlHeaderCell::getAccessibleChild( sal_Int32 ) - throw ( IndexOutOfBoundsException,RuntimeException, std::exception ) { throw IndexOutOfBoundsException(); } @@ -90,7 +88,6 @@ Reference SAL_CALL AccessibleGridControlHeaderCell::getAccessibleC /** Queries for a new interface. */ css::uno::Any SAL_CALL AccessibleGridControlHeaderCell::queryInterface( const css::uno::Type& rType ) - throw ( css::uno::RuntimeException, std::exception ) { Any aRet = AccessibleGridControlCell::queryInterface(rType); return aRet; @@ -108,7 +105,7 @@ Reference SAL_CALL AccessibleGridControlHeaderCell::getAccessibleC AccessibleGridControlCell::release(); } /** @return The XAccessibleContext interface of this object. */ - Reference< css::accessibility::XAccessibleContext > SAL_CALL AccessibleGridControlHeaderCell::getAccessibleContext() throw ( RuntimeException, std::exception ) + Reference< css::accessibility::XAccessibleContext > SAL_CALL AccessibleGridControlHeaderCell::getAccessibleContext() { ensureIsAlive(); return this; @@ -117,7 +114,6 @@ Reference SAL_CALL AccessibleGridControlHeaderCell::getAccessibleC /** Grabs the focus to the column header. */ void SAL_CALL AccessibleGridControlHeaderCell::grabFocus() - throw ( css::uno::RuntimeException, std::exception ) { } @@ -125,7 +121,6 @@ void SAL_CALL AccessibleGridControlHeaderCell::grabFocus() The name of this class. */ OUString SAL_CALL AccessibleGridControlHeaderCell::getImplementationName() - throw ( css::uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.accessibility.AccessibleGridControlHeaderCell" ); } @@ -157,7 +152,6 @@ Rectangle AccessibleGridControlHeaderCell::implGetBoundingBoxOnScreen() } sal_Int32 SAL_CALL AccessibleGridControlHeaderCell::getAccessibleIndexInParent() - throw ( RuntimeException, std::exception ) { SolarMutexGuard g; diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx index 38a04749c0ec..68262003f0f9 100644 --- a/accessibility/source/extended/AccessibleGridControlTable.cxx +++ b/accessibility/source/extended/AccessibleGridControlTable.cxx @@ -52,7 +52,6 @@ AccessibleGridControlTable::~AccessibleGridControlTable() Reference< XAccessible > SAL_CALL AccessibleGridControlTable::getAccessibleChild( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -74,7 +73,6 @@ AccessibleGridControlTable::getAccessibleChild( sal_Int32 nChildIndex ) } sal_Int32 SAL_CALL AccessibleGridControlTable::getAccessibleIndexInParent() - throw ( uno::RuntimeException, std::exception ) { ensureIsAlive(); if(m_aTable.HasRowHeader() && m_aTable.HasColHeader()) @@ -89,7 +87,6 @@ sal_Int32 SAL_CALL AccessibleGridControlTable::getAccessibleIndexInParent() Reference< XAccessible > SAL_CALL AccessibleGridControlTable::getAccessibleAtPoint( const awt::Point& rPoint ) - throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -104,7 +101,6 @@ AccessibleGridControlTable::getAccessibleAtPoint( const awt::Point& rPoint ) } void SAL_CALL AccessibleGridControlTable::grabFocus() - throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -115,7 +111,6 @@ void SAL_CALL AccessibleGridControlTable::grabFocus() // XAccessibleTable ----------------------------------------------------------- OUString SAL_CALL AccessibleGridControlTable::getAccessibleRowDescription( sal_Int32 nRow ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -125,7 +120,6 @@ OUString SAL_CALL AccessibleGridControlTable::getAccessibleRowDescription( sal_I } OUString SAL_CALL AccessibleGridControlTable::getAccessibleColumnDescription( sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -135,7 +129,6 @@ OUString SAL_CALL AccessibleGridControlTable::getAccessibleColumnDescription( sa } Reference< XAccessibleTable > SAL_CALL AccessibleGridControlTable::getAccessibleRowHeaders() - throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -147,7 +140,6 @@ Reference< XAccessibleTable > SAL_CALL AccessibleGridControlTable::getAccessible } Reference< XAccessibleTable > SAL_CALL AccessibleGridControlTable::getAccessibleColumnHeaders() - throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -156,7 +148,6 @@ Reference< XAccessibleTable > SAL_CALL AccessibleGridControlTable::getAccessible } Sequence< sal_Int32 > SAL_CALL AccessibleGridControlTable::getSelectedAccessibleRows() - throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -168,14 +159,12 @@ Sequence< sal_Int32 > SAL_CALL AccessibleGridControlTable::getSelectedAccessible //columns aren't selectable Sequence< sal_Int32 > SAL_CALL AccessibleGridControlTable::getSelectedAccessibleColumns() - throw ( uno::RuntimeException, std::exception ) { Sequence< sal_Int32 > aSelSeq(0); return aSelSeq; } sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleRowSelected( sal_Int32 nRow ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -196,7 +185,6 @@ sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleRowSelected( sal_Int32 //columns aren't selectable sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleColumnSelected( sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { (void) nColumn; return false; @@ -204,7 +192,6 @@ sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleColumnSelected( sal_In Reference< XAccessible > SAL_CALL AccessibleGridControlTable::getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -228,7 +215,6 @@ Reference< XAccessible > SAL_CALL AccessibleGridControlTable::getAccessibleCellA sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleSelected( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -239,7 +225,6 @@ sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleSelected( return isAccessibleRowSelected(nRow); } void SAL_CALL AccessibleGridControlTable::selectAccessibleChild( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -250,7 +235,6 @@ void SAL_CALL AccessibleGridControlTable::selectAccessibleChild( sal_Int32 nChil m_aTable.SelectRow( nRow, true ); } sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleChildSelected( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -261,7 +245,6 @@ sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleChildSelected( sal_Int return isAccessibleRowSelected(nRow); } void SAL_CALL AccessibleGridControlTable::clearAccessibleSelection() - throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -269,7 +252,6 @@ void SAL_CALL AccessibleGridControlTable::clearAccessibleSelection() m_aTable.SelectAllRows( false ); } void SAL_CALL AccessibleGridControlTable::selectAllAccessibleChildren() - throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -279,7 +261,6 @@ void SAL_CALL AccessibleGridControlTable::selectAllAccessibleChildren() selectedRows[i]=i; } sal_Int32 SAL_CALL AccessibleGridControlTable::getSelectedAccessibleChildCount() - throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -290,7 +271,6 @@ sal_Int32 SAL_CALL AccessibleGridControlTable::getSelectedAccessibleChildCount() } Reference< XAccessible > SAL_CALL AccessibleGridControlTable::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -303,7 +283,6 @@ AccessibleGridControlTable::getSelectedAccessibleChild( sal_Int32 nSelectedChild //not implemented yet, because only row selection possible void SAL_CALL AccessibleGridControlTable::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -313,7 +292,6 @@ void SAL_CALL AccessibleGridControlTable::deselectAccessibleChild( // XInterface ----------------------------------------------------------------- Any SAL_CALL AccessibleGridControlTable::queryInterface( const uno::Type& rType ) - throw ( uno::RuntimeException, std::exception ) { Any aAny( AccessibleGridControlTableBase::queryInterface( rType ) ); return aAny.hasValue() ? @@ -332,7 +310,6 @@ void SAL_CALL AccessibleGridControlTable::release() throw () // XServiceInfo --------------------------------------------------------------- OUString SAL_CALL AccessibleGridControlTable::getImplementationName() - throw ( uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.accessibility.AccessibleGridControlTable" ); } @@ -367,7 +344,6 @@ Rectangle AccessibleGridControlTable::implGetBoundingBoxOnScreen() // internal helper methods ---------------------------------------------------- Reference< XAccessibleTable > AccessibleGridControlTable::implGetHeaderBar( sal_Int32 nChildIndex ) - throw ( uno::RuntimeException ) { Reference< XAccessible > xRet; Reference< XAccessibleContext > xContext( m_xParent, uno::UNO_QUERY ); diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx b/accessibility/source/extended/AccessibleGridControlTableBase.cxx index 0a3e09008f6f..acf58c091cd9 100644 --- a/accessibility/source/extended/AccessibleGridControlTableBase.cxx +++ b/accessibility/source/extended/AccessibleGridControlTableBase.cxx @@ -52,7 +52,6 @@ AccessibleGridControlTableBase::~AccessibleGridControlTableBase() // XAccessibleContext --------------------------------------------------------- sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleChildCount() - throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -68,7 +67,6 @@ sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleChildCount() } sal_Int16 SAL_CALL AccessibleGridControlTableBase::getAccessibleRole() - throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -79,7 +77,6 @@ sal_Int16 SAL_CALL AccessibleGridControlTableBase::getAccessibleRole() // XAccessibleTable ----------------------------------------------------------- sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleRowCount() - throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -88,7 +85,6 @@ sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleRowCount() } sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleColumnCount() - throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -98,7 +94,6 @@ sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleColumnCount() sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleRowExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -109,7 +104,6 @@ sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleRowExtentAt( sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleColumnExtentAt( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -119,7 +113,6 @@ sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleColumnExtentAt( } Reference< XAccessible > SAL_CALL AccessibleGridControlTableBase::getAccessibleCaption() - throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -128,7 +121,6 @@ Reference< XAccessible > SAL_CALL AccessibleGridControlTableBase::getAccessibleC } Reference< XAccessible > SAL_CALL AccessibleGridControlTableBase::getAccessibleSummary() - throw ( uno::RuntimeException, std::exception ) { SolarMutexGuard g; @@ -138,7 +130,6 @@ Reference< XAccessible > SAL_CALL AccessibleGridControlTableBase::getAccessibleS sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleIndex( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -148,7 +139,6 @@ sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleIndex( } sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleRow( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -158,7 +148,6 @@ sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleRow( sal_Int32 n } sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleColumn( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -170,7 +159,6 @@ sal_Int32 SAL_CALL AccessibleGridControlTableBase::getAccessibleColumn( sal_Int3 // XInterface ----------------------------------------------------------------- Any SAL_CALL AccessibleGridControlTableBase::queryInterface( const uno::Type& rType ) - throw ( uno::RuntimeException, std::exception ) { Any aAny( GridControlAccessibleElement::queryInterface( rType ) ); return aAny.hasValue() ? @@ -190,7 +178,6 @@ void SAL_CALL AccessibleGridControlTableBase::release() throw () // XTypeProvider -------------------------------------------------------------- Sequence< uno::Type > SAL_CALL AccessibleGridControlTableBase::getTypes() - throw ( uno::RuntimeException, std::exception ) { return ::comphelper::concatSequences( GridControlAccessibleElement::getTypes(), @@ -198,7 +185,6 @@ Sequence< uno::Type > SAL_CALL AccessibleGridControlTableBase::getTypes() } Sequence< sal_Int8 > SAL_CALL AccessibleGridControlTableBase::getImplementationId() - throw ( uno::RuntimeException, std::exception ) { return css::uno::Sequence(); } @@ -226,7 +212,6 @@ void AccessibleGridControlTableBase::implGetSelectedRows( Sequence< sal_Int32 >& } void AccessibleGridControlTableBase::ensureIsValidRow( sal_Int32 nRow ) - throw ( lang::IndexOutOfBoundsException ) { if( nRow >= m_aTable.GetRowCount() ) throw lang::IndexOutOfBoundsException( @@ -234,7 +219,6 @@ void AccessibleGridControlTableBase::ensureIsValidRow( sal_Int32 nRow ) } void AccessibleGridControlTableBase::ensureIsValidColumn( sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException ) { if( nColumn >= m_aTable.GetColumnCount() ) throw lang::IndexOutOfBoundsException( @@ -243,14 +227,12 @@ void AccessibleGridControlTableBase::ensureIsValidColumn( sal_Int32 nColumn ) void AccessibleGridControlTableBase::ensureIsValidAddress( sal_Int32 nRow, sal_Int32 nColumn ) - throw ( lang::IndexOutOfBoundsException ) { ensureIsValidRow( nRow ); ensureIsValidColumn( nColumn ); } void AccessibleGridControlTableBase::ensureIsValidIndex( sal_Int32 nChildIndex ) - throw ( lang::IndexOutOfBoundsException ) { if( nChildIndex >= m_aTable.GetRowCount()*m_aTable.GetColumnCount() ) throw lang::IndexOutOfBoundsException( diff --git a/accessibility/source/extended/AccessibleGridControlTableCell.cxx b/accessibility/source/extended/AccessibleGridControlTableCell.cxx index 016eea27fc5b..55378092f535 100644 --- a/accessibility/source/extended/AccessibleGridControlTableCell.cxx +++ b/accessibility/source/extended/AccessibleGridControlTableCell.cxx @@ -31,7 +31,7 @@ namespace accessibility // FIXME this is a copy'n'paste from // source/extended/AccessibleBrowseBoxTableCell.cxx, get rid of that... /// @throws css::lang::IndexOutOfBoundsException - void checkIndex_Impl( sal_Int32 _nIndex, const OUString& _sText ) throw (css::lang::IndexOutOfBoundsException) + void checkIndex_Impl( sal_Int32 _nIndex, const OUString& _sText ) { if ( _nIndex >= _sText.getLength() ) throw css::lang::IndexOutOfBoundsException(); @@ -75,7 +75,7 @@ namespace accessibility } - void SAL_CALL AccessibleGridControlCell::grabFocus() throw ( RuntimeException, std::exception ) + void SAL_CALL AccessibleGridControlCell::grabFocus() { SolarMutexGuard aSolarGuard; @@ -114,7 +114,6 @@ namespace accessibility /** Queries for a new interface. */ css::uno::Any SAL_CALL AccessibleGridControlTableCell::queryInterface( const css::uno::Type& rType ) - throw ( css::uno::RuntimeException, std::exception ) { Any aRet = AccessibleGridControlCell::queryInterface(rType); if ( !aRet.hasValue() ) @@ -134,7 +133,7 @@ namespace accessibility AccessibleGridControlCell::release(); } - css::awt::Rectangle SAL_CALL AccessibleGridControlTableCell::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + css::awt::Rectangle SAL_CALL AccessibleGridControlTableCell::getCharacterBounds( sal_Int32 nIndex ) { SolarMutexGuard aSolarGuard; @@ -145,7 +144,7 @@ namespace accessibility return AWTRectangle( m_aTable.GetFieldCharacterBounds( getRowPos(), getColumnPos(), nIndex ) ); } - sal_Int32 SAL_CALL AccessibleGridControlTableCell::getIndexAtPoint( const css::awt::Point& _aPoint ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleGridControlTableCell::getIndexAtPoint( const css::awt::Point& _aPoint ) { SolarMutexGuard aSolarGuard; @@ -158,22 +157,18 @@ namespace accessibility The name of this class. */ OUString SAL_CALL AccessibleGridControlTableCell::getImplementationName() - throw ( css::uno::RuntimeException, std::exception ) { return OUString( "com.sun.star.accessibility.AccessibleGridControlTableCell" ); } /** @return The count of visible children. */ sal_Int32 SAL_CALL AccessibleGridControlTableCell::getAccessibleChildCount() - throw ( css::uno::RuntimeException, std::exception ) { return 0; } /** @return The css::accessibility::XAccessible interface of the specified child. */ css::uno::Reference< css::accessibility::XAccessible > SAL_CALL AccessibleGridControlTableCell::getAccessibleChild( sal_Int32 ) - throw ( css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception ) { throw css::lang::IndexOutOfBoundsException(); } @@ -205,7 +200,7 @@ namespace accessibility // css::accessibility::XAccessible /** @return The css::accessibility::XAccessibleContext interface of this object. */ - css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL AccessibleGridControlTableCell::getAccessibleContext() throw ( RuntimeException, std::exception ) + css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL AccessibleGridControlTableCell::getAccessibleContext() { SolarMutexGuard g; @@ -216,7 +211,6 @@ namespace accessibility // css::accessibility::XAccessibleContext sal_Int32 SAL_CALL AccessibleGridControlTableCell::getAccessibleIndexInParent() - throw ( css::uno::RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; @@ -225,11 +219,11 @@ namespace accessibility return ( getRowPos() * m_aTable.GetColumnCount() ) + getColumnPos(); } - sal_Int32 SAL_CALL AccessibleGridControlTableCell::getCaretPosition( ) throw (css::uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleGridControlTableCell::getCaretPosition( ) { return -1; } - sal_Bool SAL_CALL AccessibleGridControlTableCell::setCaretPosition ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleGridControlTableCell::setCaretPosition ( sal_Int32 nIndex ) { SolarMutexGuard aSolarGuard; @@ -238,13 +232,13 @@ namespace accessibility return false; } - sal_Unicode SAL_CALL AccessibleGridControlTableCell::getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) + sal_Unicode SAL_CALL AccessibleGridControlTableCell::getCharacter( sal_Int32 nIndex ) { SolarMutexGuard aSolarGuard; return OCommonAccessibleText::getCharacter( nIndex ); } - css::uno::Sequence< css::beans::PropertyValue > SAL_CALL AccessibleGridControlTableCell::getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) + css::uno::Sequence< css::beans::PropertyValue > SAL_CALL AccessibleGridControlTableCell::getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& ) { SolarMutexGuard aSolarGuard; @@ -255,32 +249,32 @@ namespace accessibility return css::uno::Sequence< css::beans::PropertyValue >(); } - sal_Int32 SAL_CALL AccessibleGridControlTableCell::getCharacterCount( ) throw (css::uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleGridControlTableCell::getCharacterCount( ) { SolarMutexGuard aSolarGuard; return OCommonAccessibleText::getCharacterCount( ); } - OUString SAL_CALL AccessibleGridControlTableCell::getSelectedText( ) throw (css::uno::RuntimeException, std::exception) + OUString SAL_CALL AccessibleGridControlTableCell::getSelectedText( ) { SolarMutexGuard aSolarGuard; return OCommonAccessibleText::getSelectedText( ); } - sal_Int32 SAL_CALL AccessibleGridControlTableCell::getSelectionStart( ) throw (css::uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleGridControlTableCell::getSelectionStart( ) { SolarMutexGuard aSolarGuard; return OCommonAccessibleText::getSelectionStart( ); } - sal_Int32 SAL_CALL AccessibleGridControlTableCell::getSelectionEnd( ) throw (css::uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleGridControlTableCell::getSelectionEnd( ) { SolarMutexGuard aSolarGuard; return OCommonAccessibleText::getSelectionEnd( ); } - sal_Bool SAL_CALL AccessibleGridControlTableCell::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleGridControlTableCell::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { SolarMutexGuard aSolarGuard; @@ -289,37 +283,37 @@ namespace accessibility return false; } - OUString SAL_CALL AccessibleGridControlTableCell::getText( ) throw (css::uno::RuntimeException, std::exception) + OUString SAL_CALL AccessibleGridControlTableCell::getText( ) { SolarMutexGuard aSolarGuard; return OCommonAccessibleText::getText( ); } - OUString SAL_CALL AccessibleGridControlTableCell::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) + OUString SAL_CALL AccessibleGridControlTableCell::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { SolarMutexGuard aSolarGuard; return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex ); } - css::accessibility::TextSegment SAL_CALL AccessibleGridControlTableCell::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) + css::accessibility::TextSegment SAL_CALL AccessibleGridControlTableCell::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { SolarMutexGuard aSolarGuard; return OCommonAccessibleText::getTextAtIndex( nIndex ,aTextType); } - css::accessibility::TextSegment SAL_CALL AccessibleGridControlTableCell::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) + css::accessibility::TextSegment SAL_CALL AccessibleGridControlTableCell::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { SolarMutexGuard aSolarGuard; return OCommonAccessibleText::getTextBeforeIndex( nIndex ,aTextType); } - css::accessibility::TextSegment SAL_CALL AccessibleGridControlTableCell::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) + css::accessibility::TextSegment SAL_CALL AccessibleGridControlTableCell::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { SolarMutexGuard aSolarGuard; return OCommonAccessibleText::getTextBehindIndex( nIndex ,aTextType); } - sal_Bool SAL_CALL AccessibleGridControlTableCell::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleGridControlTableCell::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { SolarMutexGuard aSolarGuard; diff --git a/accessibility/source/extended/accessiblebrowseboxcell.cxx b/accessibility/source/extended/accessiblebrowseboxcell.cxx index 576f00816192..099dde455ee7 100644 --- a/accessibility/source/extended/accessiblebrowseboxcell.cxx +++ b/accessibility/source/extended/accessiblebrowseboxcell.cxx @@ -48,7 +48,7 @@ namespace accessibility { } - void SAL_CALL AccessibleBrowseBoxCell::grabFocus() throw ( RuntimeException, std::exception ) + void SAL_CALL AccessibleBrowseBoxCell::grabFocus() { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); diff --git a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx index 2ce764c93ee2..acb2935f3d8a 100644 --- a/accessibility/source/extended/accessibleeditbrowseboxcell.cxx +++ b/accessibility/source/extended/accessibleeditbrowseboxcell.cxx @@ -58,7 +58,7 @@ namespace accessibility } } - OUString SAL_CALL EditBrowseBoxTableCell::getImplementationName() throw ( css::uno::RuntimeException, std::exception ) + OUString SAL_CALL EditBrowseBoxTableCell::getImplementationName() { return OUString( "com.sun.star.comp.svtools.TableCellProxy" ); } @@ -67,13 +67,13 @@ namespace accessibility IMPLEMENT_FORWARD_XTYPEPROVIDER2( EditBrowseBoxTableCell, AccessibleBrowseBoxCell, OAccessibleContextWrapperHelper ) - void EditBrowseBoxTableCell::notifyTranslatedEvent( const AccessibleEventObject& _rEvent ) throw (RuntimeException) + void EditBrowseBoxTableCell::notifyTranslatedEvent( const AccessibleEventObject& _rEvent ) { commitEvent( _rEvent.EventId, _rEvent.NewValue, _rEvent.OldValue ); } // css::accessibility::XAccessibleComponent - sal_Int32 SAL_CALL EditBrowseBoxTableCell::getForeground( ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL EditBrowseBoxTableCell::getForeground( ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -84,7 +84,7 @@ namespace accessibility return 0; } - sal_Int32 SAL_CALL EditBrowseBoxTableCell::getBackground( ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL EditBrowseBoxTableCell::getBackground( ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -95,12 +95,12 @@ namespace accessibility return 0; } - css::uno::Reference< css::accessibility::XAccessible > SAL_CALL EditBrowseBoxTableCell::getAccessibleParent( ) throw (RuntimeException, std::exception) + css::uno::Reference< css::accessibility::XAccessible > SAL_CALL EditBrowseBoxTableCell::getAccessibleParent( ) { return m_xParentAccessible; } - OUString SAL_CALL EditBrowseBoxTableCell::getAccessibleDescription() throw ( RuntimeException, std::exception ) + OUString SAL_CALL EditBrowseBoxTableCell::getAccessibleDescription() { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -108,7 +108,7 @@ namespace accessibility return m_xInnerContext->getAccessibleDescription(); } - OUString SAL_CALL EditBrowseBoxTableCell::getAccessibleName() throw ( RuntimeException, std::exception ) + OUString SAL_CALL EditBrowseBoxTableCell::getAccessibleName() { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -117,7 +117,7 @@ namespace accessibility + TK_RES_STRING(RID_STR_ACC_ROW_NUM).replaceAll("%ROWNUMBER", OUString::number(getRowPos())); } - css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL EditBrowseBoxTableCell::getAccessibleRelationSet() throw ( RuntimeException, std::exception ) + css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL EditBrowseBoxTableCell::getAccessibleRelationSet() { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -125,7 +125,7 @@ namespace accessibility return baseGetAccessibleRelationSet( ); } - css::uno::Reference SAL_CALL EditBrowseBoxTableCell::getAccessibleStateSet() throw ( RuntimeException, std::exception ) + css::uno::Reference SAL_CALL EditBrowseBoxTableCell::getAccessibleStateSet() { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -134,7 +134,7 @@ namespace accessibility // TODO: shouldn't we add an ACTIVE here? Isn't the EditBrowseBoxTableCell always ACTIVE? } - sal_Int32 SAL_CALL EditBrowseBoxTableCell::getAccessibleChildCount( ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL EditBrowseBoxTableCell::getAccessibleChildCount( ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -142,7 +142,7 @@ namespace accessibility return baseGetAccessibleChildCount(); } - css::uno::Reference< css::accessibility::XAccessible > SAL_CALL EditBrowseBoxTableCell::getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, RuntimeException, std::exception) + css::uno::Reference< css::accessibility::XAccessible > SAL_CALL EditBrowseBoxTableCell::getAccessibleChild( sal_Int32 i ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -150,7 +150,7 @@ namespace accessibility return baseGetAccessibleChild( i ); } - sal_Int16 SAL_CALL EditBrowseBoxTableCell::getAccessibleRole() throw ( RuntimeException, std::exception ) + sal_Int16 SAL_CALL EditBrowseBoxTableCell::getAccessibleRole() { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); @@ -158,7 +158,7 @@ namespace accessibility return m_xInnerContext->getAccessibleRole( ); } - void SAL_CALL EditBrowseBoxTableCell::dispose() throw( RuntimeException, std::exception ) + void SAL_CALL EditBrowseBoxTableCell::dispose() { // simply disambiguate. Note that the OComponentHelper base in AccessibleBrowseBoxCell // will call our "disposing()", which will call "dispose()" on the OAccessibleContextWrapperHelper @@ -166,7 +166,7 @@ namespace accessibility AccessibleBrowseBoxCell::dispose(); } - void SAL_CALL EditBrowseBoxTableCell::disposing( const css::lang::EventObject& _rSource ) throw (RuntimeException, std::exception) + void SAL_CALL EditBrowseBoxTableCell::disposing( const css::lang::EventObject& _rSource ) { AccessibleBrowseBoxCell::disposing( _rSource ); OAccessibleContextWrapperHelper::disposing( _rSource ); @@ -200,7 +200,7 @@ namespace accessibility { } - css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL EditBrowseBoxTableCellAccess::getAccessibleContext( ) throw (RuntimeException, std::exception) + css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL EditBrowseBoxTableCellAccess::getAccessibleContext( ) { if ( !m_pBrowseBox || !m_xControlAccessible.is() ) throw DisposedException(); diff --git a/accessibility/source/extended/accessibleiconchoicectrl.cxx b/accessibility/source/extended/accessibleiconchoicectrl.cxx index 21c4a4a7889d..901adda5ce18 100644 --- a/accessibility/source/extended/accessibleiconchoicectrl.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrl.cxx @@ -127,26 +127,26 @@ namespace accessibility // XServiceInfo - OUString SAL_CALL AccessibleIconChoiceCtrl::getImplementationName() throw (RuntimeException, std::exception) + OUString SAL_CALL AccessibleIconChoiceCtrl::getImplementationName() { return OUString( "com.sun.star.comp.svtools.AccessibleIconChoiceControl" ); } - Sequence< OUString > SAL_CALL AccessibleIconChoiceCtrl::getSupportedServiceNames() throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL AccessibleIconChoiceCtrl::getSupportedServiceNames() { return {"com.sun.star.accessibility.AccessibleContext", "com.sun.star.accessibility.AccessibleComponent", "com.sun.star.awt.AccessibleIconChoiceControl"}; } - sal_Bool SAL_CALL AccessibleIconChoiceCtrl::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleIconChoiceCtrl::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } // XAccessible - Reference< XAccessibleContext > SAL_CALL AccessibleIconChoiceCtrl::getAccessibleContext( ) throw (RuntimeException, std::exception) + Reference< XAccessibleContext > SAL_CALL AccessibleIconChoiceCtrl::getAccessibleContext( ) { ensureAlive(); return this; @@ -154,7 +154,7 @@ namespace accessibility // XAccessibleContext - sal_Int32 SAL_CALL AccessibleIconChoiceCtrl::getAccessibleChildCount( ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleIconChoiceCtrl::getAccessibleChildCount( ) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -162,7 +162,7 @@ namespace accessibility return getCtrl()->GetEntryCount(); } - Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrl::getAccessibleChild( sal_Int32 i ) throw (RuntimeException, IndexOutOfBoundsException, std::exception) + Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrl::getAccessibleChild( sal_Int32 i ) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -175,7 +175,7 @@ namespace accessibility return new AccessibleIconChoiceCtrlEntry( *pCtrl, i, this ); } - Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrl::getAccessibleParent( ) throw (RuntimeException, std::exception) + Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrl::getAccessibleParent( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -183,13 +183,13 @@ namespace accessibility return m_xParent; } - sal_Int16 SAL_CALL AccessibleIconChoiceCtrl::getAccessibleRole( ) throw (RuntimeException, std::exception) + sal_Int16 SAL_CALL AccessibleIconChoiceCtrl::getAccessibleRole( ) { //return AccessibleRole::TREE; return AccessibleRole::LIST; } - OUString SAL_CALL AccessibleIconChoiceCtrl::getAccessibleDescription( ) throw (RuntimeException, std::exception) + OUString SAL_CALL AccessibleIconChoiceCtrl::getAccessibleDescription( ) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -197,7 +197,7 @@ namespace accessibility return getCtrl()->GetAccessibleDescription(); } - OUString SAL_CALL AccessibleIconChoiceCtrl::getAccessibleName( ) throw (RuntimeException, std::exception) + OUString SAL_CALL AccessibleIconChoiceCtrl::getAccessibleName( ) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -211,7 +211,7 @@ namespace accessibility // XAccessibleSelection - void SAL_CALL AccessibleIconChoiceCtrl::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + void SAL_CALL AccessibleIconChoiceCtrl::selectAccessibleChild( sal_Int32 nChildIndex ) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -225,7 +225,7 @@ namespace accessibility pCtrl->SetCursor( pEntry ); } - sal_Bool SAL_CALL AccessibleIconChoiceCtrl::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleIconChoiceCtrl::isAccessibleChildSelected( sal_Int32 nChildIndex ) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -239,7 +239,7 @@ namespace accessibility return ( pCtrl->GetCursor() == pEntry ); } - void SAL_CALL AccessibleIconChoiceCtrl::clearAccessibleSelection( ) throw (RuntimeException, std::exception) + void SAL_CALL AccessibleIconChoiceCtrl::clearAccessibleSelection( ) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -247,7 +247,7 @@ namespace accessibility getCtrl()->SetNoSelection(); } - void SAL_CALL AccessibleIconChoiceCtrl::selectAllAccessibleChildren( ) throw (RuntimeException, std::exception) + void SAL_CALL AccessibleIconChoiceCtrl::selectAllAccessibleChildren( ) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -263,7 +263,7 @@ namespace accessibility } } - sal_Int32 SAL_CALL AccessibleIconChoiceCtrl::getSelectedAccessibleChildCount( ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleIconChoiceCtrl::getSelectedAccessibleChildCount( ) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -282,7 +282,7 @@ namespace accessibility return nSelCount; } - Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrl::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrl::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -311,7 +311,7 @@ namespace accessibility return xChild; } - void SAL_CALL AccessibleIconChoiceCtrl::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + void SAL_CALL AccessibleIconChoiceCtrl::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) { ::comphelper::OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx index ba08bff38279..05d03deccc4f 100644 --- a/accessibility/source/extended/accessibleiconchoicectrlentry.cxx +++ b/accessibility/source/extended/accessibleiconchoicectrlentry.cxx @@ -43,7 +43,7 @@ namespace { /// @throws css::lang::IndexOutOfBoundsException - void checkActionIndex_Impl( sal_Int32 _nIndex ) throw (css::lang::IndexOutOfBoundsException) + void checkActionIndex_Impl( sal_Int32 _nIndex ) { if ( _nIndex < 0 || _nIndex >= ACCESSIBLE_ACTION_COUNT ) // only three actions @@ -87,7 +87,6 @@ namespace accessibility } void AccessibleIconChoiceCtrlEntry::disposing( const css::lang::EventObject& _rSource ) -throw(RuntimeException, std::exception) { if ( _rSource.Source == m_xParent ) { @@ -152,7 +151,6 @@ throw(RuntimeException, std::exception) } Rectangle AccessibleIconChoiceCtrlEntry::GetBoundingBox() - throw (lang::DisposedException, uno::RuntimeException) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -162,7 +160,6 @@ throw(RuntimeException, std::exception) } Rectangle AccessibleIconChoiceCtrlEntry::GetBoundingBoxOnScreen() - throw (lang::DisposedException, uno::RuntimeException) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -171,7 +168,7 @@ throw(RuntimeException, std::exception) return GetBoundingBoxOnScreen_Impl(); } - void AccessibleIconChoiceCtrlEntry::EnsureIsAlive() const throw ( lang::DisposedException ) + void AccessibleIconChoiceCtrlEntry::EnsureIsAlive() const { if ( !IsAlive_Impl() ) throw lang::DisposedException(); @@ -202,7 +199,7 @@ throw(RuntimeException, std::exception) // XTypeProvider - Sequence< sal_Int8 > AccessibleIconChoiceCtrlEntry::getImplementationId() throw (RuntimeException, std::exception) + Sequence< sal_Int8 > AccessibleIconChoiceCtrlEntry::getImplementationId() { return css::uno::Sequence(); } @@ -231,26 +228,26 @@ throw(RuntimeException, std::exception) // XServiceInfo - OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getImplementationName() throw(RuntimeException, std::exception) + OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getImplementationName() { return OUString( "com.sun.star.comp.svtools.AccessibleIconChoiceControlEntry" ); } - Sequence< OUString > SAL_CALL AccessibleIconChoiceCtrlEntry::getSupportedServiceNames() throw(RuntimeException, std::exception) + Sequence< OUString > SAL_CALL AccessibleIconChoiceCtrlEntry::getSupportedServiceNames() { return {"com.sun.star.accessibility.AccessibleContext", "com.sun.star.accessibility.AccessibleComponent", "com.sun.star.awt.AccessibleIconChoiceControlEntry"}; } - sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } // XAccessible - Reference< XAccessibleContext > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleContext( ) throw (RuntimeException, std::exception) + Reference< XAccessibleContext > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleContext( ) { EnsureIsAlive(); return this; @@ -258,17 +255,17 @@ throw(RuntimeException, std::exception) // XAccessibleContext - sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleChildCount( ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleChildCount( ) { return 0; // no children } - Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleChild( sal_Int32 ) throw (IndexOutOfBoundsException,RuntimeException, std::exception) + Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleChild( sal_Int32 ) { throw IndexOutOfBoundsException(); } - Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleParent( ) throw (RuntimeException, std::exception) + Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleParent( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -276,26 +273,26 @@ throw(RuntimeException, std::exception) return m_xParent; } - sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleIndexInParent( ) { ::osl::MutexGuard aGuard( m_aMutex ); return m_nIndex; } - sal_Int16 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleRole( ) throw (RuntimeException, std::exception) + sal_Int16 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleRole( ) { //return AccessibleRole::LABEL; return AccessibleRole::LIST_ITEM; } - OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleDescription( ) throw (RuntimeException, std::exception) + OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleDescription( ) { // no description for every item return OUString(); } - OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleName( ) throw (RuntimeException, std::exception) + OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleName( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -303,12 +300,12 @@ throw(RuntimeException, std::exception) return implGetText(); } - Reference< XAccessibleRelationSet > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) + Reference< XAccessibleRelationSet > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleRelationSet( ) { return new utl::AccessibleRelationSetHelper; } - Reference< XAccessibleStateSet > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleStateSet( ) throw (RuntimeException, std::exception) + Reference< XAccessibleStateSet > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleStateSet( ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -337,7 +334,7 @@ throw(RuntimeException, std::exception) return xStateSet; } - Locale SAL_CALL AccessibleIconChoiceCtrlEntry::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) + Locale SAL_CALL AccessibleIconChoiceCtrlEntry::getLocale( ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -347,42 +344,42 @@ throw(RuntimeException, std::exception) // XAccessibleComponent - sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::containsPoint( const awt::Point& rPoint ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::containsPoint( const awt::Point& rPoint ) { return Rectangle( Point(), GetBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) ); } - Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException, std::exception) + Reference< XAccessible > SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleAtPoint( const awt::Point& ) { return Reference< XAccessible >(); } - awt::Rectangle SAL_CALL AccessibleIconChoiceCtrlEntry::getBounds( ) throw (RuntimeException, std::exception) + awt::Rectangle SAL_CALL AccessibleIconChoiceCtrlEntry::getBounds( ) { return AWTRectangle( GetBoundingBox() ); } - awt::Point SAL_CALL AccessibleIconChoiceCtrlEntry::getLocation( ) throw (RuntimeException, std::exception) + awt::Point SAL_CALL AccessibleIconChoiceCtrlEntry::getLocation( ) { return AWTPoint( GetBoundingBox().TopLeft() ); } - awt::Point SAL_CALL AccessibleIconChoiceCtrlEntry::getLocationOnScreen( ) throw (RuntimeException, std::exception) + awt::Point SAL_CALL AccessibleIconChoiceCtrlEntry::getLocationOnScreen( ) { return AWTPoint( GetBoundingBoxOnScreen().TopLeft() ); } - awt::Size SAL_CALL AccessibleIconChoiceCtrlEntry::getSize( ) throw (RuntimeException, std::exception) + awt::Size SAL_CALL AccessibleIconChoiceCtrlEntry::getSize( ) { return AWTSize( GetBoundingBox().GetSize() ); } - void SAL_CALL AccessibleIconChoiceCtrlEntry::grabFocus( ) throw (RuntimeException, std::exception) + void SAL_CALL AccessibleIconChoiceCtrlEntry::grabFocus( ) { // do nothing, because no focus for each item } - sal_Int32 AccessibleIconChoiceCtrlEntry::getForeground( ) throw (RuntimeException, std::exception) + sal_Int32 AccessibleIconChoiceCtrlEntry::getForeground( ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -399,7 +396,7 @@ throw(RuntimeException, std::exception) return nColor; } - sal_Int32 AccessibleIconChoiceCtrlEntry::getBackground( ) throw (RuntimeException, std::exception) + sal_Int32 AccessibleIconChoiceCtrlEntry::getBackground( ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -419,7 +416,7 @@ throw(RuntimeException, std::exception) // XAccessibleText - awt::Rectangle SAL_CALL AccessibleIconChoiceCtrlEntry::getCharacterBounds( sal_Int32 _nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + awt::Rectangle SAL_CALL AccessibleIconChoiceCtrlEntry::getCharacterBounds( sal_Int32 _nIndex ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -439,7 +436,7 @@ throw(RuntimeException, std::exception) return aBounds; } - sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getIndexAtPoint( const awt::Point& aPoint ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -468,7 +465,7 @@ throw(RuntimeException, std::exception) return nIndex; } - sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -486,7 +483,7 @@ throw(RuntimeException, std::exception) // XAccessibleEventBroadcaster - void SAL_CALL AccessibleIconChoiceCtrlEntry::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException, std::exception) + void SAL_CALL AccessibleIconChoiceCtrlEntry::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) { if (xListener.is()) { @@ -497,7 +494,7 @@ throw(RuntimeException, std::exception) } } - void SAL_CALL AccessibleIconChoiceCtrlEntry::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException, std::exception) + void SAL_CALL AccessibleIconChoiceCtrlEntry::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) { if (xListener.is()) { @@ -517,11 +514,11 @@ throw(RuntimeException, std::exception) } } - sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getCaretPosition( ) throw (css::uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getCaretPosition( ) { return -1; } - sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::setCaretPosition ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::setCaretPosition ( sal_Int32 nIndex ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -532,14 +529,14 @@ throw(RuntimeException, std::exception) return false; } - sal_Unicode SAL_CALL AccessibleIconChoiceCtrlEntry::getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) + sal_Unicode SAL_CALL AccessibleIconChoiceCtrlEntry::getCharacter( sal_Int32 nIndex ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getCharacter( nIndex ); } - css::uno::Sequence< css::beans::PropertyValue > SAL_CALL AccessibleIconChoiceCtrlEntry::getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) + css::uno::Sequence< css::beans::PropertyValue > SAL_CALL AccessibleIconChoiceCtrlEntry::getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -552,7 +549,7 @@ throw(RuntimeException, std::exception) return css::uno::Sequence< css::beans::PropertyValue >(); } - sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getCharacterCount( ) throw (css::uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getCharacterCount( ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -560,28 +557,28 @@ throw(RuntimeException, std::exception) return OCommonAccessibleText::getCharacterCount( ); } - OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getSelectedText( ) throw (css::uno::RuntimeException, std::exception) + OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getSelectedText( ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getSelectedText( ); } - sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getSelectionStart( ) throw (css::uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getSelectionStart( ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getSelectionStart( ); } - sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getSelectionEnd( ) throw (css::uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getSelectionEnd( ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getSelectionEnd( ); } - sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -592,35 +589,35 @@ throw(RuntimeException, std::exception) return false; } - OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getText( ) throw (css::uno::RuntimeException, std::exception) + OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getText( ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getText( ); } - OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) + OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex ); } - css::accessibility::TextSegment SAL_CALL AccessibleIconChoiceCtrlEntry::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) + css::accessibility::TextSegment SAL_CALL AccessibleIconChoiceCtrlEntry::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getTextAtIndex( nIndex ,aTextType); } - css::accessibility::TextSegment SAL_CALL AccessibleIconChoiceCtrlEntry::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) + css::accessibility::TextSegment SAL_CALL AccessibleIconChoiceCtrlEntry::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getTextBeforeIndex( nIndex ,aTextType); } - css::accessibility::TextSegment SAL_CALL AccessibleIconChoiceCtrlEntry::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) + css::accessibility::TextSegment SAL_CALL AccessibleIconChoiceCtrlEntry::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -632,7 +629,7 @@ throw(RuntimeException, std::exception) // XAccessibleAction - sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleActionCount( ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleActionCount( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -640,7 +637,7 @@ throw(RuntimeException, std::exception) return ACCESSIBLE_ACTION_COUNT; } - sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::doAccessibleAction( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleIconChoiceCtrlEntry::doAccessibleAction( sal_Int32 nIndex ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -660,7 +657,7 @@ throw(RuntimeException, std::exception) return bRet; } - OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleActionDescription( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + OUString SAL_CALL AccessibleIconChoiceCtrlEntry::getAccessibleActionDescription( sal_Int32 nIndex ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -671,7 +668,7 @@ throw(RuntimeException, std::exception) return OUString( "Select" ); } - Reference< XAccessibleKeyBinding > AccessibleIconChoiceCtrlEntry::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + Reference< XAccessibleKeyBinding > AccessibleIconChoiceCtrlEntry::getAccessibleActionKeyBinding( sal_Int32 nIndex ) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx index 2cb64e3814bb..b88cc9a58ec0 100644 --- a/accessibility/source/extended/accessiblelistbox.cxx +++ b/accessibility/source/extended/accessiblelistbox.cxx @@ -317,26 +317,26 @@ namespace accessibility // XServiceInfo - OUString SAL_CALL AccessibleListBox::getImplementationName() throw(RuntimeException, std::exception) + OUString SAL_CALL AccessibleListBox::getImplementationName() { return OUString( "com.sun.star.comp.svtools.AccessibleTreeListBox" ); } - Sequence< OUString > SAL_CALL AccessibleListBox::getSupportedServiceNames() throw(RuntimeException, std::exception) + Sequence< OUString > SAL_CALL AccessibleListBox::getSupportedServiceNames() { return {"com.sun.star.accessibility.AccessibleContext", "com.sun.star.accessibility.AccessibleComponent", "com.sun.star.awt.AccessibleTreeListBox"}; } - sal_Bool SAL_CALL AccessibleListBox::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleListBox::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } // XAccessible - Reference< XAccessibleContext > SAL_CALL AccessibleListBox::getAccessibleContext( ) throw (RuntimeException, std::exception) + Reference< XAccessibleContext > SAL_CALL AccessibleListBox::getAccessibleContext( ) { ensureAlive(); return this; @@ -344,7 +344,7 @@ namespace accessibility // XAccessibleContext - sal_Int32 SAL_CALL AccessibleListBox::getAccessibleChildCount( ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleListBox::getAccessibleChildCount( ) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -358,7 +358,7 @@ namespace accessibility return nCount; } - Reference< XAccessible > SAL_CALL AccessibleListBox::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException,RuntimeException, std::exception) + Reference< XAccessible > SAL_CALL AccessibleListBox::getAccessibleChild( sal_Int32 i ) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -372,7 +372,7 @@ namespace accessibility return new AccessibleListBoxEntry( *getListBox(), pEntry, nullptr ); } - Reference< XAccessible > SAL_CALL AccessibleListBox::getAccessibleParent( ) throw (RuntimeException, std::exception) + Reference< XAccessible > SAL_CALL AccessibleListBox::getAccessibleParent( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -410,7 +410,6 @@ namespace accessibility } sal_Int16 SAL_CALL AccessibleListBox::getAccessibleRole() - throw (RuntimeException, std::exception) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -434,7 +433,7 @@ namespace accessibility return AccessibleRole::TREE; } - OUString SAL_CALL AccessibleListBox::getAccessibleDescription( ) throw (RuntimeException, std::exception) + OUString SAL_CALL AccessibleListBox::getAccessibleDescription( ) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -442,7 +441,7 @@ namespace accessibility return getListBox()->GetAccessibleDescription(); } - OUString SAL_CALL AccessibleListBox::getAccessibleName( ) throw (RuntimeException, std::exception) + OUString SAL_CALL AccessibleListBox::getAccessibleName( ) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -452,7 +451,7 @@ namespace accessibility // XAccessibleSelection - void SAL_CALL AccessibleListBox::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + void SAL_CALL AccessibleListBox::selectAccessibleChild( sal_Int32 nChildIndex ) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -465,7 +464,7 @@ namespace accessibility getListBox()->Select( pEntry ); } - sal_Bool SAL_CALL AccessibleListBox::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleListBox::isAccessibleChildSelected( sal_Int32 nChildIndex ) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -478,7 +477,7 @@ namespace accessibility return getListBox()->IsSelected( pEntry ); } - void SAL_CALL AccessibleListBox::clearAccessibleSelection( ) throw (RuntimeException, std::exception) + void SAL_CALL AccessibleListBox::clearAccessibleSelection( ) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -493,7 +492,7 @@ namespace accessibility } } - void SAL_CALL AccessibleListBox::selectAllAccessibleChildren( ) throw (RuntimeException, std::exception) + void SAL_CALL AccessibleListBox::selectAllAccessibleChildren( ) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -508,7 +507,7 @@ namespace accessibility } } - sal_Int32 SAL_CALL AccessibleListBox::getSelectedAccessibleChildCount( ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleListBox::getSelectedAccessibleChildCount( ) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -517,7 +516,7 @@ namespace accessibility return getListBox()->GetSelectionCount(); } - Reference< XAccessible > SAL_CALL AccessibleListBox::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + Reference< XAccessible > SAL_CALL AccessibleListBox::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) { ::comphelper::OExternalLockGuard aGuard( this ); @@ -547,7 +546,7 @@ namespace accessibility return xChild; } - void SAL_CALL AccessibleListBox::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + void SAL_CALL AccessibleListBox::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) { ::comphelper::OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/extended/accessiblelistboxentry.cxx b/accessibility/source/extended/accessiblelistboxentry.cxx index ba5500f93ca3..40431c7699b4 100644 --- a/accessibility/source/extended/accessiblelistboxentry.cxx +++ b/accessibility/source/extended/accessiblelistboxentry.cxx @@ -48,7 +48,7 @@ namespace { /// @throws css::lang::IndexOutOfBoundsException - void checkActionIndex_Impl( sal_Int32 _nIndex ) throw (css::lang::IndexOutOfBoundsException) + void checkActionIndex_Impl( sal_Int32 _nIndex ) { if ( _nIndex < 0 || _nIndex >= ACCESSIBLE_ACTION_COUNT ) // only three actions @@ -165,7 +165,6 @@ namespace accessibility } Rectangle AccessibleListBoxEntry::GetBoundingBox() - throw (lang::DisposedException, uno::RuntimeException) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -175,7 +174,6 @@ namespace accessibility } Rectangle AccessibleListBoxEntry::GetBoundingBoxOnScreen() - throw (lang::DisposedException, uno::RuntimeException) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -184,7 +182,7 @@ namespace accessibility return GetBoundingBoxOnScreen_Impl(); } - void AccessibleListBoxEntry::EnsureIsAlive() const throw ( lang::DisposedException ) + void AccessibleListBoxEntry::EnsureIsAlive() const { if ( !IsAlive_Impl() ) throw lang::DisposedException(); @@ -215,7 +213,7 @@ namespace accessibility // XTypeProvider - Sequence< sal_Int8 > AccessibleListBoxEntry::getImplementationId() throw (RuntimeException, std::exception) + Sequence< sal_Int8 > AccessibleListBoxEntry::getImplementationId() { return css::uno::Sequence(); } @@ -223,7 +221,7 @@ namespace accessibility // XComponent/ListBoxAccessibleBase - void SAL_CALL AccessibleListBoxEntry::dispose() throw ( uno::RuntimeException, std::exception ) + void SAL_CALL AccessibleListBoxEntry::dispose() { AccessibleListBoxEntry_BASE::dispose(); } @@ -256,26 +254,26 @@ namespace accessibility // XServiceInfo - OUString SAL_CALL AccessibleListBoxEntry::getImplementationName() throw(RuntimeException, std::exception) + OUString SAL_CALL AccessibleListBoxEntry::getImplementationName() { return OUString( "com.sun.star.comp.svtools.AccessibleTreeListBoxEntry" ); } - Sequence< OUString > SAL_CALL AccessibleListBoxEntry::getSupportedServiceNames() throw(RuntimeException, std::exception) + Sequence< OUString > SAL_CALL AccessibleListBoxEntry::getSupportedServiceNames() { return {"com.sun.star.accessibility.AccessibleContext", "com.sun.star.accessibility.AccessibleComponent", "com.sun.star.awt.AccessibleTreeListBoxEntry"}; } - sal_Bool SAL_CALL AccessibleListBoxEntry::supportsService( const OUString& _rServiceName ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleListBoxEntry::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } // XAccessible - Reference< XAccessibleContext > SAL_CALL AccessibleListBoxEntry::getAccessibleContext( ) throw (RuntimeException, std::exception) + Reference< XAccessibleContext > SAL_CALL AccessibleListBoxEntry::getAccessibleContext( ) { EnsureIsAlive(); return this; @@ -283,7 +281,7 @@ namespace accessibility // XAccessibleContext - sal_Int32 SAL_CALL AccessibleListBoxEntry::getAccessibleChildCount( ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleListBoxEntry::getAccessibleChildCount( ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -297,7 +295,7 @@ namespace accessibility return nCount; } - Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException,RuntimeException, std::exception) + Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getAccessibleChild( sal_Int32 i ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -348,7 +346,7 @@ namespace accessibility } - Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getAccessibleParent( ) throw (RuntimeException, std::exception) + Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getAccessibleParent( ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -357,7 +355,7 @@ namespace accessibility return implGetParentAccessible( ); } - sal_Int32 SAL_CALL AccessibleListBoxEntry::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleListBoxEntry::getAccessibleIndexInParent( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -394,7 +392,7 @@ namespace accessibility return nCase; } - sal_Int16 SAL_CALL AccessibleListBoxEntry::getAccessibleRole( ) throw (RuntimeException, std::exception) + sal_Int16 SAL_CALL AccessibleListBoxEntry::getAccessibleRole( ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -432,7 +430,7 @@ namespace accessibility return AccessibleRole::UNKNOWN; } - OUString SAL_CALL AccessibleListBoxEntry::getAccessibleDescription( ) throw (RuntimeException, std::exception) + OUString SAL_CALL AccessibleListBoxEntry::getAccessibleDescription( ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -466,7 +464,7 @@ namespace accessibility } } - OUString SAL_CALL AccessibleListBoxEntry::getAccessibleName( ) throw (RuntimeException, std::exception) + OUString SAL_CALL AccessibleListBoxEntry::getAccessibleName( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -486,7 +484,7 @@ namespace accessibility return sRet; } - Reference< XAccessibleRelationSet > SAL_CALL AccessibleListBoxEntry::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) + Reference< XAccessibleRelationSet > SAL_CALL AccessibleListBoxEntry::getAccessibleRelationSet( ) { Reference< XAccessibleRelationSet > xRelSet; Reference< XAccessible > xParent; @@ -503,7 +501,7 @@ namespace accessibility return xRelSet; } - Reference< XAccessibleStateSet > SAL_CALL AccessibleListBoxEntry::getAccessibleStateSet( ) throw (RuntimeException, std::exception) + Reference< XAccessibleStateSet > SAL_CALL AccessibleListBoxEntry::getAccessibleStateSet( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -541,7 +539,7 @@ namespace accessibility return xStateSet; } - Locale SAL_CALL AccessibleListBoxEntry::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) + Locale SAL_CALL AccessibleListBoxEntry::getLocale( ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -551,12 +549,12 @@ namespace accessibility // XAccessibleComponent - sal_Bool SAL_CALL AccessibleListBoxEntry::containsPoint( const awt::Point& rPoint ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleListBoxEntry::containsPoint( const awt::Point& rPoint ) { return Rectangle( Point(), GetBoundingBox().GetSize() ).IsInside( VCLPoint( rPoint ) ); } - Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getAccessibleAtPoint( const awt::Point& _aPoint ) throw (RuntimeException, std::exception) + Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getAccessibleAtPoint( const awt::Point& _aPoint ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -574,32 +572,32 @@ namespace accessibility return xAcc; } - awt::Rectangle SAL_CALL AccessibleListBoxEntry::getBounds( ) throw (RuntimeException, std::exception) + awt::Rectangle SAL_CALL AccessibleListBoxEntry::getBounds( ) { return AWTRectangle( GetBoundingBox() ); } - awt::Point SAL_CALL AccessibleListBoxEntry::getLocation( ) throw (RuntimeException, std::exception) + awt::Point SAL_CALL AccessibleListBoxEntry::getLocation( ) { return AWTPoint( GetBoundingBox().TopLeft() ); } - awt::Point SAL_CALL AccessibleListBoxEntry::getLocationOnScreen( ) throw (RuntimeException, std::exception) + awt::Point SAL_CALL AccessibleListBoxEntry::getLocationOnScreen( ) { return AWTPoint( GetBoundingBoxOnScreen().TopLeft() ); } - awt::Size SAL_CALL AccessibleListBoxEntry::getSize( ) throw (RuntimeException, std::exception) + awt::Size SAL_CALL AccessibleListBoxEntry::getSize( ) { return AWTSize( GetBoundingBox().GetSize() ); } - void SAL_CALL AccessibleListBoxEntry::grabFocus( ) throw (RuntimeException, std::exception) + void SAL_CALL AccessibleListBoxEntry::grabFocus( ) { // do nothing, because no focus for each item } - sal_Int32 AccessibleListBoxEntry::getForeground( ) throw (RuntimeException, std::exception) + sal_Int32 AccessibleListBoxEntry::getForeground( ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -616,7 +614,7 @@ namespace accessibility return nColor; } - sal_Int32 AccessibleListBoxEntry::getBackground( ) throw (RuntimeException, std::exception) + sal_Int32 AccessibleListBoxEntry::getBackground( ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -636,7 +634,7 @@ namespace accessibility // XAccessibleText - awt::Rectangle SAL_CALL AccessibleListBoxEntry::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + awt::Rectangle SAL_CALL AccessibleListBoxEntry::getCharacterBounds( sal_Int32 nIndex ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -661,7 +659,7 @@ namespace accessibility return aBounds; } - sal_Int32 SAL_CALL AccessibleListBoxEntry::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleListBoxEntry::getIndexAtPoint( const awt::Point& aPoint ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -683,7 +681,7 @@ namespace accessibility return nIndex; } - sal_Bool SAL_CALL AccessibleListBoxEntry::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleListBoxEntry::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -702,7 +700,7 @@ namespace accessibility // XAccessibleEventBroadcaster - void SAL_CALL AccessibleListBoxEntry::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException, std::exception) + void SAL_CALL AccessibleListBoxEntry::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) { if (xListener.is()) { @@ -713,7 +711,7 @@ namespace accessibility } } - void SAL_CALL AccessibleListBoxEntry::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException, std::exception) + void SAL_CALL AccessibleListBoxEntry::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) { if (xListener.is()) { @@ -736,7 +734,7 @@ namespace accessibility // XAccessibleAction - sal_Int32 SAL_CALL AccessibleListBoxEntry::getAccessibleActionCount( ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleListBoxEntry::getAccessibleActionCount( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -757,7 +755,7 @@ namespace accessibility return 0; } - sal_Bool SAL_CALL AccessibleListBoxEntry::doAccessibleAction( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleListBoxEntry::doAccessibleAction( sal_Int32 nIndex ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -795,7 +793,7 @@ namespace accessibility return bRet; } - OUString SAL_CALL AccessibleListBoxEntry::getAccessibleActionDescription( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + OUString SAL_CALL AccessibleListBoxEntry::getAccessibleActionDescription( sal_Int32 nIndex ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -833,7 +831,7 @@ namespace accessibility throw IndexOutOfBoundsException(); } - Reference< XAccessibleKeyBinding > AccessibleListBoxEntry::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + Reference< XAccessibleKeyBinding > AccessibleListBoxEntry::getAccessibleActionKeyBinding( sal_Int32 nIndex ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -845,7 +843,7 @@ namespace accessibility // XAccessibleSelection - void SAL_CALL AccessibleListBoxEntry::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + void SAL_CALL AccessibleListBoxEntry::selectAccessibleChild( sal_Int32 nChildIndex ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -859,7 +857,7 @@ namespace accessibility getListBox()->Select( pEntry ); } - sal_Bool SAL_CALL AccessibleListBoxEntry::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleListBoxEntry::isAccessibleChildSelected( sal_Int32 nChildIndex ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -874,7 +872,7 @@ namespace accessibility return getListBox()->IsSelected( pEntry ); } - void SAL_CALL AccessibleListBoxEntry::clearAccessibleSelection( ) throw (RuntimeException, std::exception) + void SAL_CALL AccessibleListBoxEntry::clearAccessibleSelection( ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -893,7 +891,7 @@ namespace accessibility } } - void SAL_CALL AccessibleListBoxEntry::selectAllAccessibleChildren( ) throw (RuntimeException, std::exception) + void SAL_CALL AccessibleListBoxEntry::selectAllAccessibleChildren( ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -912,7 +910,7 @@ namespace accessibility } } - sal_Int32 SAL_CALL AccessibleListBoxEntry::getSelectedAccessibleChildCount( ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleListBoxEntry::getSelectedAccessibleChildCount( ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -935,7 +933,7 @@ namespace accessibility return nSelCount; } - Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + Reference< XAccessible > SAL_CALL AccessibleListBoxEntry::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -968,7 +966,7 @@ namespace accessibility return xChild; } - void SAL_CALL AccessibleListBoxEntry::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + void SAL_CALL AccessibleListBoxEntry::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -982,11 +980,11 @@ namespace accessibility getListBox()->Select( pEntry, false ); } - sal_Int32 SAL_CALL AccessibleListBoxEntry::getCaretPosition( ) throw (css::uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleListBoxEntry::getCaretPosition( ) { return -1; } - sal_Bool SAL_CALL AccessibleListBoxEntry::setCaretPosition ( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleListBoxEntry::setCaretPosition ( sal_Int32 nIndex ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -997,14 +995,14 @@ namespace accessibility return false; } - sal_Unicode SAL_CALL AccessibleListBoxEntry::getCharacter( sal_Int32 nIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) + sal_Unicode SAL_CALL AccessibleListBoxEntry::getCharacter( sal_Int32 nIndex ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getCharacter( nIndex ); } - css::uno::Sequence< css::beans::PropertyValue > SAL_CALL AccessibleListBoxEntry::getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) + css::uno::Sequence< css::beans::PropertyValue > SAL_CALL AccessibleListBoxEntry::getCharacterAttributes( sal_Int32 nIndex, const css::uno::Sequence< OUString >& ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -1017,7 +1015,7 @@ namespace accessibility return css::uno::Sequence< css::beans::PropertyValue >(); } - sal_Int32 SAL_CALL AccessibleListBoxEntry::getCharacterCount( ) throw (css::uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleListBoxEntry::getCharacterCount( ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -1025,28 +1023,28 @@ namespace accessibility return OCommonAccessibleText::getCharacterCount( ); } - OUString SAL_CALL AccessibleListBoxEntry::getSelectedText( ) throw (css::uno::RuntimeException, std::exception) + OUString SAL_CALL AccessibleListBoxEntry::getSelectedText( ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getSelectedText( ); } - sal_Int32 SAL_CALL AccessibleListBoxEntry::getSelectionStart( ) throw (css::uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleListBoxEntry::getSelectionStart( ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getSelectionStart( ); } - sal_Int32 SAL_CALL AccessibleListBoxEntry::getSelectionEnd( ) throw (css::uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleListBoxEntry::getSelectionEnd( ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getSelectionEnd( ); } - sal_Bool SAL_CALL AccessibleListBoxEntry::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleListBoxEntry::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -1057,35 +1055,35 @@ namespace accessibility return false; } - OUString SAL_CALL AccessibleListBoxEntry::getText( ) throw (css::uno::RuntimeException, std::exception) + OUString SAL_CALL AccessibleListBoxEntry::getText( ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getText( ); } - OUString SAL_CALL AccessibleListBoxEntry::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) + OUString SAL_CALL AccessibleListBoxEntry::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex ); } - css::accessibility::TextSegment SAL_CALL AccessibleListBoxEntry::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) + css::accessibility::TextSegment SAL_CALL AccessibleListBoxEntry::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getTextAtIndex( nIndex ,aTextType); } - css::accessibility::TextSegment SAL_CALL AccessibleListBoxEntry::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) + css::accessibility::TextSegment SAL_CALL AccessibleListBoxEntry::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); EnsureIsAlive(); return OCommonAccessibleText::getTextBeforeIndex( nIndex ,aTextType); } - css::accessibility::TextSegment SAL_CALL AccessibleListBoxEntry::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) + css::accessibility::TextSegment SAL_CALL AccessibleListBoxEntry::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -1097,7 +1095,7 @@ namespace accessibility // XAccessibleValue - Any AccessibleListBoxEntry::getCurrentValue( ) throw (RuntimeException, std::exception) + Any AccessibleListBoxEntry::getCurrentValue( ) { ::osl::MutexGuard aGuard( m_aMutex ); Any aValue; @@ -1108,7 +1106,7 @@ namespace accessibility } - sal_Bool AccessibleListBoxEntry::setCurrentValue( const Any& aNumber ) throw (RuntimeException, std::exception) + sal_Bool AccessibleListBoxEntry::setCurrentValue( const Any& aNumber ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1139,7 +1137,7 @@ namespace accessibility } - Any AccessibleListBoxEntry::getMaximumValue( ) throw (RuntimeException, std::exception) + Any AccessibleListBoxEntry::getMaximumValue( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1159,7 +1157,7 @@ namespace accessibility } - Any AccessibleListBoxEntry::getMinimumValue( ) throw (RuntimeException, std::exception) + Any AccessibleListBoxEntry::getMinimumValue( ) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/accessibility/source/extended/accessibletabbar.cxx b/accessibility/source/extended/accessibletabbar.cxx index 431dbd05f786..2e00081c2357 100644 --- a/accessibility/source/extended/accessibletabbar.cxx +++ b/accessibility/source/extended/accessibletabbar.cxx @@ -145,7 +145,7 @@ namespace accessibility // OCommonAccessibleComponent - awt::Rectangle AccessibleTabBar::implGetBounds() throw (RuntimeException) + awt::Rectangle AccessibleTabBar::implGetBounds() { awt::Rectangle aBounds; if ( m_pTabBar ) @@ -188,19 +188,19 @@ namespace accessibility // XServiceInfo - OUString AccessibleTabBar::getImplementationName() throw (RuntimeException, std::exception) + OUString AccessibleTabBar::getImplementationName() { return OUString( "com.sun.star.comp.svtools.AccessibleTabBar" ); } - sal_Bool AccessibleTabBar::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) + sal_Bool AccessibleTabBar::supportsService( const OUString& rServiceName ) { return cppu::supportsService(this, rServiceName); } - Sequence< OUString > AccessibleTabBar::getSupportedServiceNames() throw (RuntimeException, std::exception) + Sequence< OUString > AccessibleTabBar::getSupportedServiceNames() { return { "com.sun.star.awt.AccessibleTabBar" }; } @@ -209,7 +209,7 @@ namespace accessibility // XAccessible - Reference< XAccessibleContext > AccessibleTabBar::getAccessibleContext( ) throw (RuntimeException, std::exception) + Reference< XAccessibleContext > AccessibleTabBar::getAccessibleContext( ) { OExternalLockGuard aGuard( this ); @@ -220,7 +220,7 @@ namespace accessibility // XAccessibleContext - sal_Int32 AccessibleTabBar::getAccessibleChildCount() throw (RuntimeException, std::exception) + sal_Int32 AccessibleTabBar::getAccessibleChildCount() { OExternalLockGuard aGuard( this ); @@ -228,7 +228,7 @@ namespace accessibility } - Reference< XAccessible > AccessibleTabBar::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + Reference< XAccessible > AccessibleTabBar::getAccessibleChild( sal_Int32 i ) { OExternalLockGuard aGuard( this ); @@ -262,7 +262,7 @@ namespace accessibility } - Reference< XAccessible > AccessibleTabBar::getAccessibleParent( ) throw (RuntimeException, std::exception) + Reference< XAccessible > AccessibleTabBar::getAccessibleParent( ) { OExternalLockGuard aGuard( this ); @@ -278,7 +278,7 @@ namespace accessibility } - sal_Int32 AccessibleTabBar::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) + sal_Int32 AccessibleTabBar::getAccessibleIndexInParent( ) { OExternalLockGuard aGuard( this ); @@ -304,7 +304,7 @@ namespace accessibility } - sal_Int16 AccessibleTabBar::getAccessibleRole( ) throw (RuntimeException, std::exception) + sal_Int16 AccessibleTabBar::getAccessibleRole( ) { OExternalLockGuard aGuard( this ); @@ -312,7 +312,7 @@ namespace accessibility } - OUString AccessibleTabBar::getAccessibleDescription( ) throw (RuntimeException, std::exception) + OUString AccessibleTabBar::getAccessibleDescription( ) { OExternalLockGuard aGuard( this ); @@ -324,7 +324,7 @@ namespace accessibility } - OUString AccessibleTabBar::getAccessibleName( ) throw (RuntimeException, std::exception) + OUString AccessibleTabBar::getAccessibleName( ) { OExternalLockGuard aGuard( this ); @@ -336,7 +336,7 @@ namespace accessibility } - Reference< XAccessibleRelationSet > AccessibleTabBar::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) + Reference< XAccessibleRelationSet > AccessibleTabBar::getAccessibleRelationSet( ) { OExternalLockGuard aGuard( this ); @@ -346,7 +346,7 @@ namespace accessibility } - Reference< XAccessibleStateSet > AccessibleTabBar::getAccessibleStateSet( ) throw (RuntimeException, std::exception) + Reference< XAccessibleStateSet > AccessibleTabBar::getAccessibleStateSet( ) { OExternalLockGuard aGuard( this ); @@ -366,7 +366,7 @@ namespace accessibility } - Locale AccessibleTabBar::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) + Locale AccessibleTabBar::getLocale( ) { OExternalLockGuard aGuard( this ); @@ -377,7 +377,7 @@ namespace accessibility // XAccessibleComponent - Reference< XAccessible > AccessibleTabBar::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException, std::exception) + Reference< XAccessible > AccessibleTabBar::getAccessibleAtPoint( const awt::Point& rPoint ) { OExternalLockGuard aGuard( this ); @@ -405,7 +405,7 @@ namespace accessibility } - void AccessibleTabBar::grabFocus( ) throw (RuntimeException, std::exception) + void AccessibleTabBar::grabFocus( ) { OExternalLockGuard aGuard( this ); @@ -414,7 +414,7 @@ namespace accessibility } - sal_Int32 AccessibleTabBar::getForeground( ) throw (RuntimeException, std::exception) + sal_Int32 AccessibleTabBar::getForeground( ) { OExternalLockGuard aGuard( this ); @@ -438,7 +438,7 @@ namespace accessibility } - sal_Int32 AccessibleTabBar::getBackground( ) throw (RuntimeException, std::exception) + sal_Int32 AccessibleTabBar::getBackground( ) { OExternalLockGuard aGuard( this ); @@ -458,7 +458,7 @@ namespace accessibility // XAccessibleExtendedComponent - Reference< awt::XFont > AccessibleTabBar::getFont( ) throw (RuntimeException, std::exception) + Reference< awt::XFont > AccessibleTabBar::getFont( ) { OExternalLockGuard aGuard( this ); @@ -483,7 +483,7 @@ namespace accessibility } - OUString AccessibleTabBar::getTitledBorderText( ) throw (RuntimeException, std::exception) + OUString AccessibleTabBar::getTitledBorderText( ) { OExternalLockGuard aGuard( this ); @@ -495,7 +495,7 @@ namespace accessibility } - OUString AccessibleTabBar::getToolTipText( ) throw (RuntimeException, std::exception) + OUString AccessibleTabBar::getToolTipText( ) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/extended/accessibletabbarpage.cxx b/accessibility/source/extended/accessibletabbarpage.cxx index 9d50f4822e0b..29c3ad441c50 100644 --- a/accessibility/source/extended/accessibletabbarpage.cxx +++ b/accessibility/source/extended/accessibletabbarpage.cxx @@ -163,7 +163,7 @@ namespace accessibility // OCommonAccessibleComponent - awt::Rectangle AccessibleTabBarPage::implGetBounds() throw (RuntimeException) + awt::Rectangle AccessibleTabBarPage::implGetBounds() { awt::Rectangle aBounds; if ( m_pTabBar ) @@ -216,19 +216,19 @@ namespace accessibility // XServiceInfo - OUString AccessibleTabBarPage::getImplementationName() throw (RuntimeException, std::exception) + OUString AccessibleTabBarPage::getImplementationName() { return OUString( "com.sun.star.comp.svtools.AccessibleTabBarPage" ); } - sal_Bool AccessibleTabBarPage::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) + sal_Bool AccessibleTabBarPage::supportsService( const OUString& rServiceName ) { return cppu::supportsService(this, rServiceName); } - Sequence< OUString > AccessibleTabBarPage::getSupportedServiceNames() throw (RuntimeException, std::exception) + Sequence< OUString > AccessibleTabBarPage::getSupportedServiceNames() { return { "com.sun.star.awt.AccessibleTabBarPage" }; } @@ -237,7 +237,7 @@ namespace accessibility // XAccessible - Reference< XAccessibleContext > AccessibleTabBarPage::getAccessibleContext( ) throw (RuntimeException, std::exception) + Reference< XAccessibleContext > AccessibleTabBarPage::getAccessibleContext( ) { OExternalLockGuard aGuard( this ); @@ -248,7 +248,7 @@ namespace accessibility // XAccessibleContext - sal_Int32 AccessibleTabBarPage::getAccessibleChildCount() throw (RuntimeException, std::exception) + sal_Int32 AccessibleTabBarPage::getAccessibleChildCount() { OExternalLockGuard aGuard( this ); @@ -256,7 +256,7 @@ namespace accessibility } - Reference< XAccessible > AccessibleTabBarPage::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + Reference< XAccessible > AccessibleTabBarPage::getAccessibleChild( sal_Int32 i ) { OExternalLockGuard aGuard( this ); @@ -267,7 +267,7 @@ namespace accessibility } - Reference< XAccessible > AccessibleTabBarPage::getAccessibleParent( ) throw (RuntimeException, std::exception) + Reference< XAccessible > AccessibleTabBarPage::getAccessibleParent( ) { OExternalLockGuard aGuard( this ); @@ -275,7 +275,7 @@ namespace accessibility } - sal_Int32 AccessibleTabBarPage::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) + sal_Int32 AccessibleTabBarPage::getAccessibleIndexInParent( ) { OExternalLockGuard aGuard( this ); @@ -287,7 +287,7 @@ namespace accessibility } - sal_Int16 AccessibleTabBarPage::getAccessibleRole( ) throw (RuntimeException, std::exception) + sal_Int16 AccessibleTabBarPage::getAccessibleRole( ) { OExternalLockGuard aGuard( this ); @@ -295,7 +295,7 @@ namespace accessibility } - OUString AccessibleTabBarPage::getAccessibleDescription( ) throw (RuntimeException, std::exception) + OUString AccessibleTabBarPage::getAccessibleDescription( ) { OExternalLockGuard aGuard( this ); @@ -307,7 +307,7 @@ namespace accessibility } - OUString AccessibleTabBarPage::getAccessibleName( ) throw (RuntimeException, std::exception) + OUString AccessibleTabBarPage::getAccessibleName( ) { OExternalLockGuard aGuard( this ); @@ -315,7 +315,7 @@ namespace accessibility } - Reference< XAccessibleRelationSet > AccessibleTabBarPage::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) + Reference< XAccessibleRelationSet > AccessibleTabBarPage::getAccessibleRelationSet( ) { OExternalLockGuard aGuard( this ); @@ -325,7 +325,7 @@ namespace accessibility } - Reference< XAccessibleStateSet > AccessibleTabBarPage::getAccessibleStateSet( ) throw (RuntimeException, std::exception) + Reference< XAccessibleStateSet > AccessibleTabBarPage::getAccessibleStateSet( ) { OExternalLockGuard aGuard( this ); @@ -345,7 +345,7 @@ namespace accessibility } - Locale AccessibleTabBarPage::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) + Locale AccessibleTabBarPage::getLocale( ) { OExternalLockGuard aGuard( this ); @@ -356,7 +356,7 @@ namespace accessibility // XAccessibleComponent - Reference< XAccessible > AccessibleTabBarPage::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException, std::exception) + Reference< XAccessible > AccessibleTabBarPage::getAccessibleAtPoint( const awt::Point& ) { OExternalLockGuard aGuard( this ); @@ -364,13 +364,13 @@ namespace accessibility } - void AccessibleTabBarPage::grabFocus( ) throw (RuntimeException, std::exception) + void AccessibleTabBarPage::grabFocus( ) { // no focus } - sal_Int32 AccessibleTabBarPage::getForeground( ) throw (RuntimeException, std::exception) + sal_Int32 AccessibleTabBarPage::getForeground( ) { OExternalLockGuard aGuard( this ); @@ -387,7 +387,7 @@ namespace accessibility } - sal_Int32 AccessibleTabBarPage::getBackground( ) throw (RuntimeException, std::exception) + sal_Int32 AccessibleTabBarPage::getBackground( ) { OExternalLockGuard aGuard( this ); @@ -407,7 +407,7 @@ namespace accessibility // XAccessibleExtendedComponent - Reference< awt::XFont > AccessibleTabBarPage::getFont( ) throw (RuntimeException, std::exception) + Reference< awt::XFont > AccessibleTabBarPage::getFont( ) { OExternalLockGuard aGuard( this ); @@ -424,7 +424,7 @@ namespace accessibility } - OUString AccessibleTabBarPage::getTitledBorderText( ) throw (RuntimeException, std::exception) + OUString AccessibleTabBarPage::getTitledBorderText( ) { OExternalLockGuard aGuard( this ); @@ -432,7 +432,7 @@ namespace accessibility } - OUString AccessibleTabBarPage::getToolTipText( ) throw (RuntimeException, std::exception) + OUString AccessibleTabBarPage::getToolTipText( ) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/extended/accessibletabbarpagelist.cxx b/accessibility/source/extended/accessibletabbarpagelist.cxx index 05848a598b66..eac83b7fd20c 100644 --- a/accessibility/source/extended/accessibletabbarpagelist.cxx +++ b/accessibility/source/extended/accessibletabbarpagelist.cxx @@ -321,7 +321,7 @@ namespace accessibility // OCommonAccessibleComponent - awt::Rectangle AccessibleTabBarPageList::implGetBounds() throw (RuntimeException) + awt::Rectangle AccessibleTabBarPageList::implGetBounds() { awt::Rectangle aBounds; if ( m_pTabBar ) @@ -364,19 +364,19 @@ namespace accessibility // XServiceInfo - OUString AccessibleTabBarPageList::getImplementationName() throw (RuntimeException, std::exception) + OUString AccessibleTabBarPageList::getImplementationName() { return OUString( "com.sun.star.comp.svtools.AccessibleTabBarPageList" ); } - sal_Bool AccessibleTabBarPageList::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) + sal_Bool AccessibleTabBarPageList::supportsService( const OUString& rServiceName ) { return cppu::supportsService(this, rServiceName); } - Sequence< OUString > AccessibleTabBarPageList::getSupportedServiceNames() throw (RuntimeException, std::exception) + Sequence< OUString > AccessibleTabBarPageList::getSupportedServiceNames() { return { "com.sun.star.awt.AccessibleTabBarPageList" }; } @@ -385,7 +385,7 @@ namespace accessibility // XAccessible - Reference< XAccessibleContext > AccessibleTabBarPageList::getAccessibleContext( ) throw (RuntimeException, std::exception) + Reference< XAccessibleContext > AccessibleTabBarPageList::getAccessibleContext( ) { OExternalLockGuard aGuard( this ); @@ -396,7 +396,7 @@ namespace accessibility // XAccessibleContext - sal_Int32 AccessibleTabBarPageList::getAccessibleChildCount() throw (RuntimeException, std::exception) + sal_Int32 AccessibleTabBarPageList::getAccessibleChildCount() { OExternalLockGuard aGuard( this ); @@ -404,7 +404,7 @@ namespace accessibility } - Reference< XAccessible > AccessibleTabBarPageList::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + Reference< XAccessible > AccessibleTabBarPageList::getAccessibleChild( sal_Int32 i ) { OExternalLockGuard aGuard( this ); @@ -429,7 +429,7 @@ namespace accessibility } - Reference< XAccessible > AccessibleTabBarPageList::getAccessibleParent( ) throw (RuntimeException, std::exception) + Reference< XAccessible > AccessibleTabBarPageList::getAccessibleParent( ) { OExternalLockGuard aGuard( this ); @@ -441,7 +441,7 @@ namespace accessibility } - sal_Int32 AccessibleTabBarPageList::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) + sal_Int32 AccessibleTabBarPageList::getAccessibleIndexInParent( ) { OExternalLockGuard aGuard( this ); @@ -449,7 +449,7 @@ namespace accessibility } - sal_Int16 AccessibleTabBarPageList::getAccessibleRole( ) throw (RuntimeException, std::exception) + sal_Int16 AccessibleTabBarPageList::getAccessibleRole( ) { OExternalLockGuard aGuard( this ); @@ -457,7 +457,7 @@ namespace accessibility } - OUString AccessibleTabBarPageList::getAccessibleDescription( ) throw (RuntimeException, std::exception) + OUString AccessibleTabBarPageList::getAccessibleDescription( ) { OExternalLockGuard aGuard( this ); @@ -465,7 +465,7 @@ namespace accessibility } - OUString AccessibleTabBarPageList::getAccessibleName( ) throw (RuntimeException, std::exception) + OUString AccessibleTabBarPageList::getAccessibleName( ) { OExternalLockGuard aGuard( this ); @@ -473,7 +473,7 @@ namespace accessibility } - Reference< XAccessibleRelationSet > AccessibleTabBarPageList::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) + Reference< XAccessibleRelationSet > AccessibleTabBarPageList::getAccessibleRelationSet( ) { OExternalLockGuard aGuard( this ); @@ -483,7 +483,7 @@ namespace accessibility } - Reference< XAccessibleStateSet > AccessibleTabBarPageList::getAccessibleStateSet( ) throw (RuntimeException, std::exception) + Reference< XAccessibleStateSet > AccessibleTabBarPageList::getAccessibleStateSet( ) { OExternalLockGuard aGuard( this ); @@ -503,7 +503,7 @@ namespace accessibility } - Locale AccessibleTabBarPageList::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) + Locale AccessibleTabBarPageList::getLocale( ) { OExternalLockGuard aGuard( this ); @@ -514,7 +514,7 @@ namespace accessibility // XAccessibleComponent - Reference< XAccessible > AccessibleTabBarPageList::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException, std::exception) + Reference< XAccessible > AccessibleTabBarPageList::getAccessibleAtPoint( const awt::Point& rPoint ) { OExternalLockGuard aGuard( this ); @@ -542,13 +542,13 @@ namespace accessibility } - void AccessibleTabBarPageList::grabFocus( ) throw (RuntimeException, std::exception) + void AccessibleTabBarPageList::grabFocus( ) { // no focus } - sal_Int32 AccessibleTabBarPageList::getForeground( ) throw (RuntimeException, std::exception) + sal_Int32 AccessibleTabBarPageList::getForeground( ) { OExternalLockGuard aGuard( this ); @@ -565,7 +565,7 @@ namespace accessibility } - sal_Int32 AccessibleTabBarPageList::getBackground( ) throw (RuntimeException, std::exception) + sal_Int32 AccessibleTabBarPageList::getBackground( ) { OExternalLockGuard aGuard( this ); @@ -585,7 +585,7 @@ namespace accessibility // XAccessibleExtendedComponent - Reference< awt::XFont > AccessibleTabBarPageList::getFont( ) throw (RuntimeException, std::exception) + Reference< awt::XFont > AccessibleTabBarPageList::getFont( ) { OExternalLockGuard aGuard( this ); @@ -602,7 +602,7 @@ namespace accessibility } - OUString AccessibleTabBarPageList::getTitledBorderText( ) throw (RuntimeException, std::exception) + OUString AccessibleTabBarPageList::getTitledBorderText( ) { OExternalLockGuard aGuard( this ); @@ -610,7 +610,7 @@ namespace accessibility } - OUString AccessibleTabBarPageList::getToolTipText( ) throw (RuntimeException, std::exception) + OUString AccessibleTabBarPageList::getToolTipText( ) { OExternalLockGuard aGuard( this ); @@ -621,7 +621,7 @@ namespace accessibility // XAccessibleSelection - void AccessibleTabBarPageList::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + void AccessibleTabBarPageList::selectAccessibleChild( sal_Int32 nChildIndex ) { OExternalLockGuard aGuard( this ); @@ -638,7 +638,7 @@ namespace accessibility } - sal_Bool AccessibleTabBarPageList::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + sal_Bool AccessibleTabBarPageList::isAccessibleChildSelected( sal_Int32 nChildIndex ) { OExternalLockGuard aGuard( this ); @@ -653,13 +653,13 @@ namespace accessibility } - void AccessibleTabBarPageList::clearAccessibleSelection( ) throw (RuntimeException, std::exception) + void AccessibleTabBarPageList::clearAccessibleSelection( ) { // This method makes no sense in a TabBar, and so does nothing. } - void AccessibleTabBarPageList::selectAllAccessibleChildren( ) throw (RuntimeException, std::exception) + void AccessibleTabBarPageList::selectAllAccessibleChildren( ) { OExternalLockGuard aGuard( this ); @@ -667,7 +667,7 @@ namespace accessibility } - sal_Int32 AccessibleTabBarPageList::getSelectedAccessibleChildCount( ) throw (RuntimeException, std::exception) + sal_Int32 AccessibleTabBarPageList::getSelectedAccessibleChildCount( ) { OExternalLockGuard aGuard( this ); @@ -675,7 +675,7 @@ namespace accessibility } - Reference< XAccessible > AccessibleTabBarPageList::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + Reference< XAccessible > AccessibleTabBarPageList::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) { OExternalLockGuard aGuard( this ); @@ -697,7 +697,7 @@ namespace accessibility } - void AccessibleTabBarPageList::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + void AccessibleTabBarPageList::deselectAccessibleChild( sal_Int32 nChildIndex ) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/extended/accessibletablistbox.cxx b/accessibility/source/extended/accessibletablistbox.cxx index 5f7824d190cb..6da361b0b910 100644 --- a/accessibility/source/extended/accessibletablistbox.cxx +++ b/accessibility/source/extended/accessibletablistbox.cxx @@ -75,13 +75,12 @@ namespace accessibility // XAccessibleContext --------------------------------------------------------- sal_Int32 SAL_CALL AccessibleTabListBox::getAccessibleChildCount() - throw ( uno::RuntimeException, std::exception ) { return 2; // header and table } - Reference< XAccessibleContext > SAL_CALL AccessibleTabListBox::getAccessibleContext() throw ( RuntimeException, std::exception ) + Reference< XAccessibleContext > SAL_CALL AccessibleTabListBox::getAccessibleContext() { return this; } @@ -89,7 +88,6 @@ namespace accessibility Reference< XAccessible > SAL_CALL AccessibleTabListBox::getAccessibleChild( sal_Int32 nChildIndex ) - throw ( IndexOutOfBoundsException, RuntimeException, std::exception ) { SolarMethodGuard aGuard(getMutex()); ensureIsAlive(); diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx index 2536ba06943e..d50f98ad56c8 100644 --- a/accessibility/source/extended/accessibletablistboxtable.cxx +++ b/accessibility/source/extended/accessibletablistboxtable.cxx @@ -311,14 +311,14 @@ namespace accessibility // XServiceInfo - OUString AccessibleTabListBoxTable::getImplementationName() throw (RuntimeException, std::exception) + OUString AccessibleTabListBoxTable::getImplementationName() { return OUString( "com.sun.star.comp.svtools.AccessibleTabListBoxTable" ); } // XAccessibleSelection - void SAL_CALL AccessibleTabListBoxTable::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + void SAL_CALL AccessibleTabListBoxTable::selectAccessibleChild( sal_Int32 nChildIndex ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); @@ -329,7 +329,7 @@ namespace accessibility implSelectRow( implGetRow( nChildIndex ), true ); } - sal_Bool SAL_CALL AccessibleTabListBoxTable::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + sal_Bool SAL_CALL AccessibleTabListBoxTable::isAccessibleChildSelected( sal_Int32 nChildIndex ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); @@ -340,7 +340,7 @@ namespace accessibility return m_pTabListBox && m_pTabListBox->IsSelected( m_pTabListBox->GetEntry( implGetRow( nChildIndex ) ) ); } - void SAL_CALL AccessibleTabListBoxTable::clearAccessibleSelection( ) throw (RuntimeException, std::exception) + void SAL_CALL AccessibleTabListBoxTable::clearAccessibleSelection( ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); @@ -350,7 +350,7 @@ namespace accessibility m_pTabListBox->SetNoSelection(); } - void SAL_CALL AccessibleTabListBoxTable::selectAllAccessibleChildren( ) throw (RuntimeException, std::exception) + void SAL_CALL AccessibleTabListBoxTable::selectAllAccessibleChildren( ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); @@ -360,7 +360,7 @@ namespace accessibility m_pTabListBox->SelectAll(); } - sal_Int32 SAL_CALL AccessibleTabListBoxTable::getSelectedAccessibleChildCount( ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL AccessibleTabListBoxTable::getSelectedAccessibleChildCount( ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); @@ -370,7 +370,7 @@ namespace accessibility return implGetColumnCount() * implGetSelRowCount(); } - Reference< XAccessible > SAL_CALL AccessibleTabListBoxTable::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + Reference< XAccessible > SAL_CALL AccessibleTabListBoxTable::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); @@ -386,7 +386,7 @@ namespace accessibility return getAccessibleCellAt( nRow, nColumn ); } - void SAL_CALL AccessibleTabListBoxTable::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + void SAL_CALL AccessibleTabListBoxTable::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( getMutex() ); diff --git a/accessibility/source/extended/textwindowaccessibility.cxx b/accessibility/source/extended/textwindowaccessibility.cxx index c7180e8e13c4..5ee6a1d63cbb 100644 --- a/accessibility/source/extended/textwindowaccessibility.cxx +++ b/accessibility/source/extended/textwindowaccessibility.cxx @@ -106,7 +106,7 @@ void Paragraph::notifyEvent(::sal_Int16 nEventId, // virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL -Paragraph::getAccessibleContext() throw (css::uno::RuntimeException, std::exception) +Paragraph::getAccessibleContext() { checkDisposed(); return this; @@ -114,7 +114,6 @@ Paragraph::getAccessibleContext() throw (css::uno::RuntimeException, std::except // virtual ::sal_Int32 SAL_CALL Paragraph::getAccessibleChildCount() - throw (css::uno::RuntimeException, std::exception) { checkDisposed(); return 0; @@ -123,8 +122,6 @@ Paragraph::getAccessibleContext() throw (css::uno::RuntimeException, std::except // virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL Paragraph::getAccessibleChild(::sal_Int32) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) { checkDisposed(); throw css::lang::IndexOutOfBoundsException( @@ -136,7 +133,6 @@ Paragraph::getAccessibleChild(::sal_Int32) // virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL Paragraph::getAccessibleParent() - throw (css::uno::RuntimeException, std::exception) { checkDisposed(); return m_xDocument->getAccessible(); @@ -144,7 +140,6 @@ Paragraph::getAccessibleParent() // virtual ::sal_Int32 SAL_CALL Paragraph::getAccessibleIndexInParent() - throw (css::uno::RuntimeException, std::exception) { checkDisposed(); return m_xDocument->retrieveParagraphIndex(this); @@ -152,7 +147,6 @@ Paragraph::getAccessibleParent() // virtual ::sal_Int16 SAL_CALL Paragraph::getAccessibleRole() - throw (css::uno::RuntimeException, std::exception) { checkDisposed(); return css::accessibility::AccessibleRole::PARAGRAPH; @@ -160,7 +154,6 @@ Paragraph::getAccessibleParent() // virtual OUString SAL_CALL Paragraph::getAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) { checkDisposed(); return OUString(); @@ -168,7 +161,6 @@ OUString SAL_CALL Paragraph::getAccessibleDescription() // virtual OUString SAL_CALL Paragraph::getAccessibleName() - throw (css::uno::RuntimeException, std::exception) { checkDisposed(); return OUString(); @@ -177,7 +169,6 @@ OUString SAL_CALL Paragraph::getAccessibleName() // virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL Paragraph::getAccessibleRelationSet() - throw (css::uno::RuntimeException, std::exception) { checkDisposed(); return m_xDocument->retrieveParagraphRelationSet( this ); @@ -186,7 +177,6 @@ SAL_CALL Paragraph::getAccessibleRelationSet() // virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL Paragraph::getAccessibleStateSet() - throw (css::uno::RuntimeException, std::exception) { checkDisposed(); @@ -198,8 +188,6 @@ SAL_CALL Paragraph::getAccessibleStateSet() // virtual css::lang::Locale SAL_CALL Paragraph::getLocale() - throw (css::accessibility::IllegalAccessibleComponentStateException, - css::uno::RuntimeException, std::exception) { checkDisposed(); return m_xDocument->retrieveLocale(); @@ -207,7 +195,6 @@ css::lang::Locale SAL_CALL Paragraph::getLocale() // virtual sal_Bool SAL_CALL Paragraph::containsPoint(css::awt::Point const & rPoint) - throw (css::uno::RuntimeException, std::exception) { checkDisposed(); css::awt::Rectangle aRect(m_xDocument->retrieveParagraphBounds(this, @@ -219,7 +206,6 @@ sal_Bool SAL_CALL Paragraph::containsPoint(css::awt::Point const & rPoint) // virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL Paragraph::getAccessibleAtPoint(css::awt::Point const &) - throw (css::uno::RuntimeException, std::exception) { checkDisposed(); return nullptr; @@ -227,7 +213,6 @@ Paragraph::getAccessibleAtPoint(css::awt::Point const &) // virtual css::awt::Rectangle SAL_CALL Paragraph::getBounds() - throw (css::uno::RuntimeException, std::exception) { checkDisposed(); return m_xDocument->retrieveParagraphBounds(this, false); @@ -235,7 +220,6 @@ css::awt::Rectangle SAL_CALL Paragraph::getBounds() // virtual css::awt::Point SAL_CALL Paragraph::getLocation() - throw (css::uno::RuntimeException, std::exception) { checkDisposed(); css::awt::Rectangle aRect(m_xDocument->retrieveParagraphBounds(this, @@ -245,7 +229,6 @@ css::awt::Point SAL_CALL Paragraph::getLocation() // virtual css::awt::Point SAL_CALL Paragraph::getLocationOnScreen() - throw (css::uno::RuntimeException, std::exception) { checkDisposed(); css::awt::Rectangle aRect(m_xDocument->retrieveParagraphBounds(this, @@ -255,7 +238,6 @@ css::awt::Point SAL_CALL Paragraph::getLocationOnScreen() // virtual css::awt::Size SAL_CALL Paragraph::getSize() - throw (css::uno::RuntimeException, std::exception) { checkDisposed(); css::awt::Rectangle aRect(m_xDocument->retrieveParagraphBounds(this, @@ -264,7 +246,7 @@ css::awt::Size SAL_CALL Paragraph::getSize() } // virtual -void SAL_CALL Paragraph::grabFocus() throw (css::uno::RuntimeException, std::exception) +void SAL_CALL Paragraph::grabFocus() { checkDisposed(); VclPtr pWindow = m_xDocument->GetWindow(); @@ -286,21 +268,18 @@ void SAL_CALL Paragraph::grabFocus() throw (css::uno::RuntimeException, std::exc // virtual css::util::Color SAL_CALL Paragraph::getForeground() - throw (css::uno::RuntimeException, std::exception) { return 0; // TODO } // virtual css::util::Color SAL_CALL Paragraph::getBackground() - throw (css::uno::RuntimeException, std::exception) { return 0; // TODO } // virtual ::sal_Int32 SAL_CALL Paragraph::getCaretPosition() - throw (css::uno::RuntimeException, std::exception) { checkDisposed(); return m_xDocument->retrieveParagraphCaretPosition(this); @@ -308,8 +287,6 @@ css::util::Color SAL_CALL Paragraph::getBackground() // virtual sal_Bool SAL_CALL Paragraph::setCaretPosition(::sal_Int32 nIndex) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) { checkDisposed(); m_xDocument->changeParagraphSelection(this, nIndex, nIndex); @@ -318,8 +295,6 @@ sal_Bool SAL_CALL Paragraph::setCaretPosition(::sal_Int32 nIndex) // virtual ::sal_Unicode SAL_CALL Paragraph::getCharacter(::sal_Int32 nIndex) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) { checkDisposed(); return OCommonAccessibleText::getCharacter(nIndex); @@ -328,8 +303,6 @@ sal_Bool SAL_CALL Paragraph::setCaretPosition(::sal_Int32 nIndex) // virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL Paragraph::getCharacterAttributes(::sal_Int32 nIndex, const css::uno::Sequence< OUString >& aRequestedAttributes) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) { checkDisposed(); return m_xDocument->retrieveCharacterAttributes( this, nIndex, aRequestedAttributes ); @@ -338,8 +311,6 @@ Paragraph::getCharacterAttributes(::sal_Int32 nIndex, const css::uno::Sequence< // virtual css::awt::Rectangle SAL_CALL Paragraph::getCharacterBounds(::sal_Int32 nIndex) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) { checkDisposed(); css::awt::Rectangle aBounds(m_xDocument->retrieveCharacterBounds(this, nIndex)); @@ -351,7 +322,6 @@ Paragraph::getCharacterBounds(::sal_Int32 nIndex) // virtual ::sal_Int32 SAL_CALL Paragraph::getCharacterCount() - throw (css::uno::RuntimeException, std::exception) { checkDisposed(); return OCommonAccessibleText::getCharacterCount(); @@ -360,7 +330,6 @@ Paragraph::getCharacterBounds(::sal_Int32 nIndex) // virtual ::sal_Int32 SAL_CALL Paragraph::getIndexAtPoint(css::awt::Point const & rPoint) - throw (css::uno::RuntimeException, std::exception) { checkDisposed(); css::awt::Point aPoint(rPoint); @@ -372,7 +341,6 @@ Paragraph::getIndexAtPoint(css::awt::Point const & rPoint) // virtual OUString SAL_CALL Paragraph::getSelectedText() - throw (css::uno::RuntimeException, std::exception) { checkDisposed(); @@ -381,7 +349,6 @@ OUString SAL_CALL Paragraph::getSelectedText() // virtual ::sal_Int32 SAL_CALL Paragraph::getSelectionStart() - throw (css::uno::RuntimeException, std::exception) { checkDisposed(); return OCommonAccessibleText::getSelectionStart(); @@ -389,7 +356,6 @@ OUString SAL_CALL Paragraph::getSelectedText() // virtual ::sal_Int32 SAL_CALL Paragraph::getSelectionEnd() - throw (css::uno::RuntimeException, std::exception) { checkDisposed(); return OCommonAccessibleText::getSelectionEnd(); @@ -398,8 +364,6 @@ OUString SAL_CALL Paragraph::getSelectedText() // virtual sal_Bool SAL_CALL Paragraph::setSelection(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) { checkDisposed(); m_xDocument->changeParagraphSelection(this, nStartIndex, nEndIndex); @@ -408,7 +372,6 @@ sal_Bool SAL_CALL Paragraph::setSelection(::sal_Int32 nStartIndex, // virtual OUString SAL_CALL Paragraph::getText() - throw (css::uno::RuntimeException, std::exception) { checkDisposed(); return OCommonAccessibleText::getText(); @@ -417,29 +380,27 @@ OUString SAL_CALL Paragraph::getText() // virtual OUString SAL_CALL Paragraph::getTextRange(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) { checkDisposed(); return OCommonAccessibleText::getTextRange(nStartIndex, nEndIndex); } // virtual -css::accessibility::TextSegment SAL_CALL Paragraph::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) +css::accessibility::TextSegment SAL_CALL Paragraph::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { checkDisposed(); return OCommonAccessibleText::getTextAtIndex(nIndex, aTextType); } // virtual -css::accessibility::TextSegment SAL_CALL Paragraph::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) +css::accessibility::TextSegment SAL_CALL Paragraph::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { checkDisposed(); return OCommonAccessibleText::getTextBeforeIndex(nIndex, aTextType); } // virtual -css::accessibility::TextSegment SAL_CALL Paragraph::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) +css::accessibility::TextSegment SAL_CALL Paragraph::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { checkDisposed(); return OCommonAccessibleText::getTextBehindIndex(nIndex, aTextType); @@ -448,8 +409,6 @@ css::accessibility::TextSegment SAL_CALL Paragraph::getTextBehindIndex( sal_Int3 // virtual sal_Bool SAL_CALL Paragraph::copyText(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) { checkDisposed(); m_xDocument->copyParagraphText(this, nStartIndex, nEndIndex); @@ -459,8 +418,6 @@ sal_Bool SAL_CALL Paragraph::copyText(::sal_Int32 nStartIndex, // virtual sal_Bool SAL_CALL Paragraph::cutText(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) { checkDisposed(); m_xDocument->changeParagraphText(this, nStartIndex, nEndIndex, true, false, @@ -470,8 +427,6 @@ sal_Bool SAL_CALL Paragraph::cutText(::sal_Int32 nStartIndex, // virtual sal_Bool SAL_CALL Paragraph::pasteText(::sal_Int32 nIndex) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) { checkDisposed(); m_xDocument->changeParagraphText(this, nIndex, nIndex, false, true, @@ -482,8 +437,6 @@ sal_Bool SAL_CALL Paragraph::pasteText(::sal_Int32 nIndex) // virtual sal_Bool SAL_CALL Paragraph::deleteText(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) { checkDisposed(); m_xDocument->changeParagraphText(this, nStartIndex, nEndIndex, false, false, @@ -494,8 +447,6 @@ sal_Bool SAL_CALL Paragraph::deleteText(::sal_Int32 nStartIndex, // virtual sal_Bool SAL_CALL Paragraph::insertText(OUString const & rText, ::sal_Int32 nIndex) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) { checkDisposed(); m_xDocument->changeParagraphText(this, nIndex, nIndex, false, false, rText); @@ -506,8 +457,6 @@ sal_Bool SAL_CALL Paragraph::insertText(OUString const & rText, sal_Bool SAL_CALL Paragraph::replaceText(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex, OUString const & rReplacement) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) { checkDisposed(); m_xDocument->changeParagraphText(this, nStartIndex, nEndIndex, false, false, @@ -519,8 +468,6 @@ Paragraph::replaceText(::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex, sal_Bool SAL_CALL Paragraph::setAttributes( ::sal_Int32 nStartIndex, ::sal_Int32 nEndIndex, css::uno::Sequence< css::beans::PropertyValue > const & rAttributeSet) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) { checkDisposed(); m_xDocument->changeParagraphAttributes(this, nStartIndex, nEndIndex, @@ -530,7 +477,6 @@ sal_Bool SAL_CALL Paragraph::setAttributes( // virtual sal_Bool SAL_CALL Paragraph::setText(OUString const & rText) - throw (css::uno::RuntimeException, std::exception) { checkDisposed(); m_xDocument->changeParagraphText(this, rText); @@ -540,7 +486,6 @@ sal_Bool SAL_CALL Paragraph::setText(OUString const & rText) // virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL Paragraph::getDefaultAttributes(const css::uno::Sequence< OUString >& RequestedAttributes) - throw (css::uno::RuntimeException, std::exception) { checkDisposed(); return m_xDocument->retrieveDefaultAttributes( this, RequestedAttributes ); @@ -549,8 +494,6 @@ Paragraph::getDefaultAttributes(const css::uno::Sequence< OUString >& RequestedA // virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL Paragraph::getRunAttributes(::sal_Int32 Index, const css::uno::Sequence< OUString >& RequestedAttributes) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) { checkDisposed(); return m_xDocument->retrieveRunAttributes( this, Index, RequestedAttributes ); @@ -558,8 +501,6 @@ Paragraph::getRunAttributes(::sal_Int32 Index, const css::uno::Sequence< OUStrin // virtual ::sal_Int32 SAL_CALL Paragraph::getLineNumberAtIndex( ::sal_Int32 nIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) { checkDisposed(); @@ -571,8 +512,6 @@ Paragraph::getRunAttributes(::sal_Int32 Index, const css::uno::Sequence< OUStrin // virtual css::accessibility::TextSegment SAL_CALL Paragraph::getTextAtLineNumber( ::sal_Int32 nLineNo ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) { checkDisposed(); @@ -585,7 +524,6 @@ css::accessibility::TextSegment SAL_CALL Paragraph::getTextAtLineNumber( ::sal_I // virtual css::accessibility::TextSegment SAL_CALL Paragraph::getTextAtLineWithCaret( ) - throw (css::uno::RuntimeException, std::exception) { checkDisposed(); @@ -605,7 +543,6 @@ css::accessibility::TextSegment SAL_CALL Paragraph::getTextAtLineWithCaret( ) // virtual ::sal_Int32 SAL_CALL Paragraph::getNumberOfLineWithCaret( ) - throw (css::uno::RuntimeException, std::exception) { checkDisposed(); return m_xDocument->retrieveParagraphLineWithCursor(this); @@ -616,7 +553,6 @@ css::accessibility::TextSegment SAL_CALL Paragraph::getTextAtLineWithCaret( ) void SAL_CALL Paragraph::addAccessibleEventListener( css::uno::Reference< css::accessibility::XAccessibleEventListener > const & rListener) - throw (css::uno::RuntimeException, std::exception) { if (rListener.is()) { @@ -640,7 +576,6 @@ void SAL_CALL Paragraph::addAccessibleEventListener( void SAL_CALL Paragraph::removeAccessibleEventListener( css::uno::Reference< css::accessibility::XAccessibleEventListener > const & rListener) - throw (css::uno::RuntimeException, std::exception) { comphelper::AccessibleEventNotifier::TClientId nId = 0; { @@ -1441,7 +1376,6 @@ Document::retrieveParagraphRelationSet( Paragraph const * pParagraph ) // virtual ::sal_Int32 SAL_CALL Document::getAccessibleChildCount() - throw (css::uno::RuntimeException, std::exception) { ::comphelper::OExternalLockGuard aGuard(this); init(); @@ -1451,8 +1385,6 @@ Document::retrieveParagraphRelationSet( Paragraph const * pParagraph ) // virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL Document::getAccessibleChild(::sal_Int32 i) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) { ::comphelper::OExternalLockGuard aGuard(this); init(); @@ -1467,7 +1399,6 @@ Document::getAccessibleChild(::sal_Int32 i) // virtual ::sal_Int16 SAL_CALL Document::getAccessibleRole() - throw (css::uno::RuntimeException, std::exception) { return css::accessibility::AccessibleRole::TEXT_FRAME; } @@ -1475,7 +1406,6 @@ Document::getAccessibleChild(::sal_Int32 i) // virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL Document::getAccessibleAtPoint(css::awt::Point const & rPoint) - throw (css::uno::RuntimeException, std::exception) { ::comphelper::OExternalLockGuard aGuard(this); init(); diff --git a/accessibility/source/standard/accessiblemenubasecomponent.cxx b/accessibility/source/standard/accessiblemenubasecomponent.cxx index 0d8fb8d8b03a..911d21eeb2e4 100644 --- a/accessibility/source/standard/accessiblemenubasecomponent.cxx +++ b/accessibility/source/standard/accessiblemenubasecomponent.cxx @@ -684,7 +684,7 @@ void OAccessibleMenuBaseComponent::disposing() // XServiceInfo -sal_Bool OAccessibleMenuBaseComponent::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) +sal_Bool OAccessibleMenuBaseComponent::supportsService( const OUString& rServiceName ) { return cppu::supportsService(this, rServiceName); } @@ -693,7 +693,7 @@ sal_Bool OAccessibleMenuBaseComponent::supportsService( const OUString& rService // XAccessible -Reference< XAccessibleContext > OAccessibleMenuBaseComponent::getAccessibleContext( ) throw (RuntimeException, std::exception) +Reference< XAccessibleContext > OAccessibleMenuBaseComponent::getAccessibleContext( ) { OExternalLockGuard aGuard( this ); @@ -704,7 +704,7 @@ Reference< XAccessibleContext > OAccessibleMenuBaseComponent::getAccessibleConte // XAccessibleContext -Reference< XAccessibleStateSet > OAccessibleMenuBaseComponent::getAccessibleStateSet( ) throw (RuntimeException, std::exception) +Reference< XAccessibleStateSet > OAccessibleMenuBaseComponent::getAccessibleStateSet( ) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/accessiblemenucomponent.cxx b/accessibility/source/standard/accessiblemenucomponent.cxx index 2fc95d3afcca..ec69408f222f 100644 --- a/accessibility/source/standard/accessiblemenucomponent.cxx +++ b/accessibility/source/standard/accessiblemenucomponent.cxx @@ -100,7 +100,7 @@ void OAccessibleMenuComponent::FillAccessibleStateSet( utl::AccessibleStateSetHe // OCommonAccessibleComponent -awt::Rectangle OAccessibleMenuComponent::implGetBounds() throw (RuntimeException) +awt::Rectangle OAccessibleMenuComponent::implGetBounds() { awt::Rectangle aBounds( 0, 0, 0, 0 ); @@ -149,7 +149,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( OAccessibleMenuComponent, OAccessibleMenuBaseC // XAccessibleContext -sal_Int32 OAccessibleMenuComponent::getAccessibleChildCount() throw (RuntimeException, std::exception) +sal_Int32 OAccessibleMenuComponent::getAccessibleChildCount() { OExternalLockGuard aGuard( this ); @@ -157,7 +157,7 @@ sal_Int32 OAccessibleMenuComponent::getAccessibleChildCount() throw (RuntimeExce } -Reference< XAccessible > OAccessibleMenuComponent::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XAccessible > OAccessibleMenuComponent::getAccessibleChild( sal_Int32 i ) { OExternalLockGuard aGuard( this ); @@ -168,7 +168,7 @@ Reference< XAccessible > OAccessibleMenuComponent::getAccessibleChild( sal_Int32 } -Reference< XAccessible > OAccessibleMenuComponent::getAccessibleParent( ) throw (RuntimeException, std::exception) +Reference< XAccessible > OAccessibleMenuComponent::getAccessibleParent( ) { OExternalLockGuard aGuard( this ); @@ -189,7 +189,7 @@ Reference< XAccessible > OAccessibleMenuComponent::getAccessibleParent( ) throw } -sal_Int16 OAccessibleMenuComponent::getAccessibleRole( ) throw (RuntimeException, std::exception) +sal_Int16 OAccessibleMenuComponent::getAccessibleRole( ) { OExternalLockGuard aGuard( this ); @@ -197,7 +197,7 @@ sal_Int16 OAccessibleMenuComponent::getAccessibleRole( ) throw (RuntimeExceptio } -OUString OAccessibleMenuComponent::getAccessibleDescription( ) throw (RuntimeException, std::exception) +OUString OAccessibleMenuComponent::getAccessibleDescription( ) { OExternalLockGuard aGuard( this ); @@ -213,7 +213,7 @@ OUString OAccessibleMenuComponent::getAccessibleDescription( ) throw (RuntimeExc } -OUString OAccessibleMenuComponent::getAccessibleName( ) throw (RuntimeException, std::exception) +OUString OAccessibleMenuComponent::getAccessibleName( ) { OExternalLockGuard aGuard( this ); @@ -221,7 +221,7 @@ OUString OAccessibleMenuComponent::getAccessibleName( ) throw (RuntimeException } -Reference< XAccessibleRelationSet > OAccessibleMenuComponent::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) +Reference< XAccessibleRelationSet > OAccessibleMenuComponent::getAccessibleRelationSet( ) { OExternalLockGuard aGuard( this ); @@ -231,7 +231,7 @@ Reference< XAccessibleRelationSet > OAccessibleMenuComponent::getAccessibleRelat } -Locale OAccessibleMenuComponent::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) +Locale OAccessibleMenuComponent::getLocale( ) { OExternalLockGuard aGuard( this ); @@ -242,7 +242,7 @@ Locale OAccessibleMenuComponent::getLocale( ) throw (IllegalAccessibleComponent // XAccessibleComponent -Reference< XAccessible > OAccessibleMenuComponent::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException, std::exception) +Reference< XAccessible > OAccessibleMenuComponent::getAccessibleAtPoint( const awt::Point& rPoint ) { OExternalLockGuard aGuard( this ); @@ -250,7 +250,7 @@ Reference< XAccessible > OAccessibleMenuComponent::getAccessibleAtPoint( const a } -awt::Point OAccessibleMenuComponent::getLocationOnScreen( ) throw (RuntimeException, std::exception) +awt::Point OAccessibleMenuComponent::getLocationOnScreen( ) { OExternalLockGuard aGuard( this ); @@ -270,7 +270,7 @@ awt::Point OAccessibleMenuComponent::getLocationOnScreen( ) throw (RuntimeExcep } -void OAccessibleMenuComponent::grabFocus( ) throw (RuntimeException, std::exception) +void OAccessibleMenuComponent::grabFocus( ) { OExternalLockGuard aGuard( this ); @@ -283,7 +283,7 @@ void OAccessibleMenuComponent::grabFocus( ) throw (RuntimeException, std::excep } -sal_Int32 OAccessibleMenuComponent::getForeground( ) throw (RuntimeException, std::exception) +sal_Int32 OAccessibleMenuComponent::getForeground( ) { OExternalLockGuard aGuard( this ); @@ -294,7 +294,7 @@ sal_Int32 OAccessibleMenuComponent::getForeground( ) throw (RuntimeException, s } -sal_Int32 OAccessibleMenuComponent::getBackground( ) throw (RuntimeException, std::exception) +sal_Int32 OAccessibleMenuComponent::getBackground( ) { OExternalLockGuard aGuard( this ); @@ -305,7 +305,7 @@ sal_Int32 OAccessibleMenuComponent::getBackground( ) throw (RuntimeException, s // XAccessibleExtendedComponent -Reference< awt::XFont > OAccessibleMenuComponent::getFont( ) throw (RuntimeException, std::exception) +Reference< awt::XFont > OAccessibleMenuComponent::getFont( ) { OExternalLockGuard aGuard( this ); @@ -331,7 +331,7 @@ Reference< awt::XFont > OAccessibleMenuComponent::getFont( ) throw (RuntimeExce } -OUString OAccessibleMenuComponent::getTitledBorderText( ) throw (RuntimeException, std::exception) +OUString OAccessibleMenuComponent::getTitledBorderText( ) { OExternalLockGuard aGuard( this ); @@ -339,7 +339,7 @@ OUString OAccessibleMenuComponent::getTitledBorderText( ) throw (RuntimeExcepti } -OUString OAccessibleMenuComponent::getToolTipText( ) throw (RuntimeException, std::exception) +OUString OAccessibleMenuComponent::getToolTipText( ) { OExternalLockGuard aGuard( this ); @@ -350,7 +350,7 @@ OUString OAccessibleMenuComponent::getToolTipText( ) throw (RuntimeException, s // XAccessibleSelection -void OAccessibleMenuComponent::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +void OAccessibleMenuComponent::selectAccessibleChild( sal_Int32 nChildIndex ) { OExternalLockGuard aGuard( this ); @@ -361,7 +361,7 @@ void OAccessibleMenuComponent::selectAccessibleChild( sal_Int32 nChildIndex ) th } -sal_Bool OAccessibleMenuComponent::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool OAccessibleMenuComponent::isAccessibleChildSelected( sal_Int32 nChildIndex ) { OExternalLockGuard aGuard( this ); @@ -372,7 +372,7 @@ sal_Bool OAccessibleMenuComponent::isAccessibleChildSelected( sal_Int32 nChildIn } -void OAccessibleMenuComponent::clearAccessibleSelection( ) throw (RuntimeException, std::exception) +void OAccessibleMenuComponent::clearAccessibleSelection( ) { OExternalLockGuard aGuard( this ); @@ -380,13 +380,13 @@ void OAccessibleMenuComponent::clearAccessibleSelection( ) throw (RuntimeExcept } -void OAccessibleMenuComponent::selectAllAccessibleChildren( ) throw (RuntimeException, std::exception) +void OAccessibleMenuComponent::selectAllAccessibleChildren( ) { // This method makes no sense in a menu, and so does nothing. } -sal_Int32 OAccessibleMenuComponent::getSelectedAccessibleChildCount( ) throw (RuntimeException, std::exception) +sal_Int32 OAccessibleMenuComponent::getSelectedAccessibleChildCount( ) { OExternalLockGuard aGuard( this ); @@ -402,7 +402,7 @@ sal_Int32 OAccessibleMenuComponent::getSelectedAccessibleChildCount( ) throw (R } -Reference< XAccessible > OAccessibleMenuComponent::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XAccessible > OAccessibleMenuComponent::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) { OExternalLockGuard aGuard( this ); @@ -424,7 +424,7 @@ Reference< XAccessible > OAccessibleMenuComponent::getSelectedAccessibleChild( s } -void OAccessibleMenuComponent::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +void OAccessibleMenuComponent::deselectAccessibleChild( sal_Int32 nChildIndex ) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/accessiblemenuitemcomponent.cxx b/accessibility/source/standard/accessiblemenuitemcomponent.cxx index 50a83c63192b..33d469703c80 100644 --- a/accessibility/source/standard/accessiblemenuitemcomponent.cxx +++ b/accessibility/source/standard/accessiblemenuitemcomponent.cxx @@ -245,7 +245,7 @@ void OAccessibleMenuItemComponent::FillAccessibleStateSet( utl::AccessibleStateS // OCommonAccessibleComponent -awt::Rectangle OAccessibleMenuItemComponent::implGetBounds() throw (RuntimeException) +awt::Rectangle OAccessibleMenuItemComponent::implGetBounds() { awt::Rectangle aBounds( 0, 0, 0, 0 ); @@ -298,7 +298,7 @@ void SAL_CALL OAccessibleMenuItemComponent::disposing() // XAccessibleContext -sal_Int32 OAccessibleMenuItemComponent::getAccessibleChildCount() throw (RuntimeException, std::exception) +sal_Int32 OAccessibleMenuItemComponent::getAccessibleChildCount() { OExternalLockGuard aGuard( this ); @@ -306,7 +306,7 @@ sal_Int32 OAccessibleMenuItemComponent::getAccessibleChildCount() throw (Runtime } -Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleChild( sal_Int32 i ) { OExternalLockGuard aGuard( this ); @@ -317,7 +317,7 @@ Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleChild( sal_I } -Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleParent( ) throw (RuntimeException, std::exception) +Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleParent( ) { OExternalLockGuard aGuard( this ); @@ -325,7 +325,7 @@ Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleParent( ) t } -sal_Int32 OAccessibleMenuItemComponent::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) +sal_Int32 OAccessibleMenuItemComponent::getAccessibleIndexInParent( ) { OExternalLockGuard aGuard( this ); @@ -333,7 +333,7 @@ sal_Int32 OAccessibleMenuItemComponent::getAccessibleIndexInParent( ) throw (Ru } -sal_Int16 OAccessibleMenuItemComponent::getAccessibleRole( ) throw (RuntimeException, std::exception) +sal_Int16 OAccessibleMenuItemComponent::getAccessibleRole( ) { OExternalLockGuard aGuard( this ); @@ -341,7 +341,7 @@ sal_Int16 OAccessibleMenuItemComponent::getAccessibleRole( ) throw (RuntimeExce } -OUString OAccessibleMenuItemComponent::getAccessibleDescription( ) throw (RuntimeException, std::exception) +OUString OAccessibleMenuItemComponent::getAccessibleDescription( ) { OExternalLockGuard aGuard( this ); @@ -353,7 +353,7 @@ OUString OAccessibleMenuItemComponent::getAccessibleDescription( ) throw (Runtim } -OUString OAccessibleMenuItemComponent::getAccessibleName( ) throw (RuntimeException, std::exception) +OUString OAccessibleMenuItemComponent::getAccessibleName( ) { OExternalLockGuard aGuard( this ); @@ -361,7 +361,7 @@ OUString OAccessibleMenuItemComponent::getAccessibleName( ) throw (RuntimeExcep } -Reference< XAccessibleRelationSet > OAccessibleMenuItemComponent::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) +Reference< XAccessibleRelationSet > OAccessibleMenuItemComponent::getAccessibleRelationSet( ) { OExternalLockGuard aGuard( this ); @@ -371,7 +371,7 @@ Reference< XAccessibleRelationSet > OAccessibleMenuItemComponent::getAccessibleR } -Locale OAccessibleMenuItemComponent::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) +Locale OAccessibleMenuItemComponent::getLocale( ) { OExternalLockGuard aGuard( this ); @@ -382,7 +382,7 @@ Locale OAccessibleMenuItemComponent::getLocale( ) throw (IllegalAccessibleCompo // XAccessibleComponent -Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException, std::exception) +Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleAtPoint( const awt::Point& ) { OExternalLockGuard aGuard( this ); @@ -390,13 +390,13 @@ Reference< XAccessible > OAccessibleMenuItemComponent::getAccessibleAtPoint( con } -void OAccessibleMenuItemComponent::grabFocus( ) throw (RuntimeException, std::exception) +void OAccessibleMenuItemComponent::grabFocus( ) { // no focus for items } -sal_Int32 OAccessibleMenuItemComponent::getForeground( ) throw (RuntimeException, std::exception) +sal_Int32 OAccessibleMenuItemComponent::getForeground( ) { OExternalLockGuard aGuard( this ); @@ -413,7 +413,7 @@ sal_Int32 OAccessibleMenuItemComponent::getForeground( ) throw (RuntimeExceptio } -sal_Int32 OAccessibleMenuItemComponent::getBackground( ) throw (RuntimeException, std::exception) +sal_Int32 OAccessibleMenuItemComponent::getBackground( ) { OExternalLockGuard aGuard( this ); @@ -433,7 +433,7 @@ sal_Int32 OAccessibleMenuItemComponent::getBackground( ) throw (RuntimeExceptio // XAccessibleExtendedComponent -Reference< awt::XFont > OAccessibleMenuItemComponent::getFont( ) throw (RuntimeException, std::exception) +Reference< awt::XFont > OAccessibleMenuItemComponent::getFont( ) { OExternalLockGuard aGuard( this ); @@ -450,7 +450,7 @@ Reference< awt::XFont > OAccessibleMenuItemComponent::getFont( ) throw (Runtime } -OUString OAccessibleMenuItemComponent::getTitledBorderText( ) throw (RuntimeException, std::exception) +OUString OAccessibleMenuItemComponent::getTitledBorderText( ) { OExternalLockGuard aGuard( this ); @@ -458,7 +458,7 @@ OUString OAccessibleMenuItemComponent::getTitledBorderText( ) throw (RuntimeExc } -OUString OAccessibleMenuItemComponent::getToolTipText( ) throw (RuntimeException, std::exception) +OUString OAccessibleMenuItemComponent::getToolTipText( ) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx index 2c043439a6d9..995ab3b73bd7 100644 --- a/accessibility/source/standard/vclxaccessiblebox.cxx +++ b/accessibility/source/standard/vclxaccessiblebox.cxx @@ -262,7 +262,6 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2(VCLXAccessibleBox, VCLXAccessibleComponent, VCL //===== XAccessible ========================================================= Reference< XAccessibleContext > SAL_CALL VCLXAccessibleBox::getAccessibleContext( ) - throw (RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -272,7 +271,6 @@ Reference< XAccessibleContext > SAL_CALL VCLXAccessibleBox::getAccessibleContext //===== XAccessibleContext ================================================== sal_Int32 SAL_CALL VCLXAccessibleBox::getAccessibleChildCount() - throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -296,7 +294,6 @@ sal_Int32 SAL_CALL VCLXAccessibleBox::getAccessibleChildCount() } Reference SAL_CALL VCLXAccessibleBox::getAccessibleChild (sal_Int32 i) - throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -345,7 +342,7 @@ Reference SAL_CALL VCLXAccessibleBox::getAccessibleChild (sal_Int32 return xChild; } -sal_Int16 SAL_CALL VCLXAccessibleBox::getAccessibleRole() throw (RuntimeException, std::exception) +sal_Int16 SAL_CALL VCLXAccessibleBox::getAccessibleRole() { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -360,7 +357,6 @@ sal_Int16 SAL_CALL VCLXAccessibleBox::getAccessibleRole() throw (RuntimeExceptio } sal_Int32 SAL_CALL VCLXAccessibleBox::getAccessibleIndexInParent() - throw (css::uno::RuntimeException, std::exception) { if (m_nIndexInParent != DEFAULT_INDEX_IN_PARENT) return m_nIndexInParent; @@ -371,7 +367,6 @@ sal_Int32 SAL_CALL VCLXAccessibleBox::getAccessibleIndexInParent() //===== XAccessibleAction =================================================== sal_Int32 SAL_CALL VCLXAccessibleBox::getAccessibleActionCount() - throw (RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex> aGuard (GetMutex()); @@ -381,7 +376,6 @@ sal_Int32 SAL_CALL VCLXAccessibleBox::getAccessibleActionCount() } sal_Bool SAL_CALL VCLXAccessibleBox::doAccessibleAction (sal_Int32 nIndex) - throw (IndexOutOfBoundsException, RuntimeException, std::exception) { bool bNotify = false; @@ -423,7 +417,6 @@ sal_Bool SAL_CALL VCLXAccessibleBox::doAccessibleAction (sal_Int32 nIndex) } OUString SAL_CALL VCLXAccessibleBox::getAccessibleActionDescription (sal_Int32 nIndex) - throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); if (nIndex<0 || nIndex>=getAccessibleActionCount()) @@ -436,7 +429,6 @@ OUString SAL_CALL VCLXAccessibleBox::getAccessibleActionDescription (sal_Int32 n } Reference< XAccessibleKeyBinding > VCLXAccessibleBox::getAccessibleActionKeyBinding( sal_Int32 nIndex ) - throw (IndexOutOfBoundsException, RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -451,7 +443,6 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleBox::getAccessibleActionKeyBind // ===== XAccessibleValue =============================================== Any VCLXAccessibleBox::getCurrentValue( ) - throw( RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -488,7 +479,6 @@ Any VCLXAccessibleBox::getCurrentValue( ) } sal_Bool VCLXAccessibleBox::setCurrentValue( const Any& aNumber ) - throw( RuntimeException, std::exception ) { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -504,14 +494,12 @@ sal_Bool VCLXAccessibleBox::setCurrentValue( const Any& aNumber ) } Any VCLXAccessibleBox::getMaximumValue( ) - throw( RuntimeException, std::exception ) { Any aAny; return aAny; } Any VCLXAccessibleBox::getMinimumValue( ) - throw( RuntimeException, std::exception ) { Any aAny; return aAny; diff --git a/accessibility/source/standard/vclxaccessiblebutton.cxx b/accessibility/source/standard/vclxaccessiblebutton.cxx index cd12ca8c8796..7b2270fdb866 100644 --- a/accessibility/source/standard/vclxaccessiblebutton.cxx +++ b/accessibility/source/standard/vclxaccessiblebutton.cxx @@ -120,13 +120,13 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleButton, VCLXAccessibleTextCompon // XServiceInfo -OUString VCLXAccessibleButton::getImplementationName() throw (RuntimeException, std::exception) +OUString VCLXAccessibleButton::getImplementationName() { return OUString( "com.sun.star.comp.toolkit.AccessibleButton" ); } -Sequence< OUString > VCLXAccessibleButton::getSupportedServiceNames() throw (RuntimeException, std::exception) +Sequence< OUString > VCLXAccessibleButton::getSupportedServiceNames() { return { "com.sun.star.awt.AccessibleButton" }; } @@ -135,7 +135,7 @@ Sequence< OUString > VCLXAccessibleButton::getSupportedServiceNames() throw (Run // XAccessibleContext -OUString VCLXAccessibleButton::getAccessibleName( ) throw (RuntimeException, std::exception) +OUString VCLXAccessibleButton::getAccessibleName( ) { OExternalLockGuard aGuard( this ); @@ -173,7 +173,7 @@ OUString VCLXAccessibleButton::getAccessibleName( ) throw (RuntimeException, st // XAccessibleAction -sal_Int32 VCLXAccessibleButton::getAccessibleActionCount( ) throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleButton::getAccessibleActionCount( ) { OExternalLockGuard aGuard( this ); @@ -181,7 +181,7 @@ sal_Int32 VCLXAccessibleButton::getAccessibleActionCount( ) throw (RuntimeExcept } -sal_Bool VCLXAccessibleButton::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool VCLXAccessibleButton::doAccessibleAction ( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); @@ -196,7 +196,7 @@ sal_Bool VCLXAccessibleButton::doAccessibleAction ( sal_Int32 nIndex ) throw (In } -OUString VCLXAccessibleButton::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +OUString VCLXAccessibleButton::getAccessibleActionDescription ( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); @@ -207,7 +207,7 @@ OUString VCLXAccessibleButton::getAccessibleActionDescription ( sal_Int32 nIndex } -Reference< XAccessibleKeyBinding > VCLXAccessibleButton::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XAccessibleKeyBinding > VCLXAccessibleButton::getAccessibleActionKeyBinding( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); @@ -248,7 +248,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleButton::getAccessibleActionKeyB // XAccessibleValue -Any VCLXAccessibleButton::getCurrentValue( ) throw (RuntimeException, std::exception) +Any VCLXAccessibleButton::getCurrentValue( ) { OExternalLockGuard aGuard( this ); @@ -262,7 +262,7 @@ Any VCLXAccessibleButton::getCurrentValue( ) throw (RuntimeException, std::exce } -sal_Bool VCLXAccessibleButton::setCurrentValue( const Any& aNumber ) throw (RuntimeException, std::exception) +sal_Bool VCLXAccessibleButton::setCurrentValue( const Any& aNumber ) { OExternalLockGuard aGuard( this ); @@ -287,7 +287,7 @@ sal_Bool VCLXAccessibleButton::setCurrentValue( const Any& aNumber ) throw (Runt } -Any VCLXAccessibleButton::getMaximumValue( ) throw (RuntimeException, std::exception) +Any VCLXAccessibleButton::getMaximumValue( ) { OExternalLockGuard aGuard( this ); @@ -298,7 +298,7 @@ Any VCLXAccessibleButton::getMaximumValue( ) throw (RuntimeException, std::exce } -Any VCLXAccessibleButton::getMinimumValue( ) throw (RuntimeException, std::exception) +Any VCLXAccessibleButton::getMinimumValue( ) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessiblecheckbox.cxx b/accessibility/source/standard/vclxaccessiblecheckbox.cxx index 8c71bb48ec59..1459b6d2b506 100644 --- a/accessibility/source/standard/vclxaccessiblecheckbox.cxx +++ b/accessibility/source/standard/vclxaccessiblecheckbox.cxx @@ -156,13 +156,13 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleCheckBox, VCLXAccessibleTextComp // XServiceInfo -OUString VCLXAccessibleCheckBox::getImplementationName() throw (RuntimeException, std::exception) +OUString VCLXAccessibleCheckBox::getImplementationName() { return OUString( "com.sun.star.comp.toolkit.AccessibleCheckBox" ); } -Sequence< OUString > VCLXAccessibleCheckBox::getSupportedServiceNames() throw (RuntimeException, std::exception) +Sequence< OUString > VCLXAccessibleCheckBox::getSupportedServiceNames() { return { "com.sun.star.awt.AccessibleCheckBox" }; } @@ -171,7 +171,7 @@ Sequence< OUString > VCLXAccessibleCheckBox::getSupportedServiceNames() throw (R // XAccessibleAction -sal_Int32 VCLXAccessibleCheckBox::getAccessibleActionCount( ) throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleCheckBox::getAccessibleActionCount( ) { OExternalLockGuard aGuard( this ); @@ -179,7 +179,7 @@ sal_Int32 VCLXAccessibleCheckBox::getAccessibleActionCount( ) throw (RuntimeExce } -sal_Bool VCLXAccessibleCheckBox::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool VCLXAccessibleCheckBox::doAccessibleAction ( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); @@ -210,7 +210,7 @@ sal_Bool VCLXAccessibleCheckBox::doAccessibleAction ( sal_Int32 nIndex ) throw ( } -OUString VCLXAccessibleCheckBox::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +OUString VCLXAccessibleCheckBox::getAccessibleActionDescription ( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); @@ -224,7 +224,7 @@ OUString VCLXAccessibleCheckBox::getAccessibleActionDescription ( sal_Int32 nInd } -Reference< XAccessibleKeyBinding > VCLXAccessibleCheckBox::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XAccessibleKeyBinding > VCLXAccessibleCheckBox::getAccessibleActionKeyBinding( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); @@ -265,7 +265,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleCheckBox::getAccessibleActionKe // XAccessibleValue -Any VCLXAccessibleCheckBox::getCurrentValue( ) throw (RuntimeException, std::exception) +Any VCLXAccessibleCheckBox::getCurrentValue( ) { OExternalLockGuard aGuard( this ); @@ -279,7 +279,7 @@ Any VCLXAccessibleCheckBox::getCurrentValue( ) throw (RuntimeException, std::ex } -sal_Bool VCLXAccessibleCheckBox::setCurrentValue( const Any& aNumber ) throw (RuntimeException, std::exception) +sal_Bool VCLXAccessibleCheckBox::setCurrentValue( const Any& aNumber ) { OExternalLockGuard aGuard( this ); @@ -306,7 +306,7 @@ sal_Bool VCLXAccessibleCheckBox::setCurrentValue( const Any& aNumber ) throw (Ru } -Any VCLXAccessibleCheckBox::getMaximumValue( ) throw (RuntimeException, std::exception) +Any VCLXAccessibleCheckBox::getMaximumValue( ) { OExternalLockGuard aGuard( this ); @@ -322,7 +322,7 @@ Any VCLXAccessibleCheckBox::getMaximumValue( ) throw (RuntimeException, std::ex } -Any VCLXAccessibleCheckBox::getMinimumValue( ) throw (RuntimeException, std::exception) +Any VCLXAccessibleCheckBox::getMinimumValue( ) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessiblecombobox.cxx b/accessibility/source/standard/vclxaccessiblecombobox.cxx index 1e4288e6815e..f7ac8890c762 100644 --- a/accessibility/source/standard/vclxaccessiblecombobox.cxx +++ b/accessibility/source/standard/vclxaccessiblecombobox.cxx @@ -49,14 +49,12 @@ bool VCLXAccessibleComboBox::IsValid() const // XServiceInfo OUString VCLXAccessibleComboBox::getImplementationName() - throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.toolkit.AccessibleComboBox" ); } Sequence< OUString > VCLXAccessibleComboBox::getSupportedServiceNames() - throw (RuntimeException, std::exception) { Sequence< OUString > aNames = VCLXAccessibleBox::getSupportedServiceNames(); sal_Int32 nLength = aNames.getLength(); diff --git a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx index 55b4506e05d3..e8aa7e599b2c 100644 --- a/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx +++ b/accessibility/source/standard/vclxaccessibledropdowncombobox.cxx @@ -79,14 +79,12 @@ void VCLXAccessibleDropDownComboBox::ProcessWindowEvent (const VclWindowEvent& r // XServiceInfo OUString VCLXAccessibleDropDownComboBox::getImplementationName() - throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.toolkit.AccessibleDropDownComboBox" ); } Sequence< OUString > VCLXAccessibleDropDownComboBox::getSupportedServiceNames() - throw (RuntimeException, std::exception) { Sequence< OUString > aNames = VCLXAccessibleBox::getSupportedServiceNames(); sal_Int32 nLength = aNames.getLength(); diff --git a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx index 67358b1b14eb..ca8ae7ee981b 100644 --- a/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx +++ b/accessibility/source/standard/vclxaccessibledropdownlistbox.cxx @@ -63,14 +63,12 @@ bool VCLXAccessibleDropDownListBox::IsValid() const // XServiceInfo OUString VCLXAccessibleDropDownListBox::getImplementationName() - throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.toolkit.AccessibleDropDownListBox" ); } Sequence< OUString > VCLXAccessibleDropDownListBox::getSupportedServiceNames() - throw (RuntimeException, std::exception) { Sequence< OUString > aNames = VCLXAccessibleBox::getSupportedServiceNames(); sal_Int32 nLength = aNames.getLength(); diff --git a/accessibility/source/standard/vclxaccessibleedit.cxx b/accessibility/source/standard/vclxaccessibleedit.cxx index f9763202405a..8860044e1f66 100644 --- a/accessibility/source/standard/vclxaccessibleedit.cxx +++ b/accessibility/source/standard/vclxaccessibleedit.cxx @@ -181,13 +181,13 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleEdit, VCLXAccessibleTextComponen // XServiceInfo -OUString VCLXAccessibleEdit::getImplementationName() throw (RuntimeException, std::exception) +OUString VCLXAccessibleEdit::getImplementationName() { return OUString( "com.sun.star.comp.toolkit.AccessibleEdit" ); } -Sequence< OUString > VCLXAccessibleEdit::getSupportedServiceNames() throw (RuntimeException, std::exception) +Sequence< OUString > VCLXAccessibleEdit::getSupportedServiceNames() { return { "com.sun.star.awt.AccessibleEdit" }; } @@ -196,7 +196,7 @@ Sequence< OUString > VCLXAccessibleEdit::getSupportedServiceNames() throw (Runti // XAccessibleContext -sal_Int32 VCLXAccessibleEdit::getAccessibleChildCount() throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleEdit::getAccessibleChildCount() { OExternalLockGuard aGuard( this ); @@ -204,7 +204,7 @@ sal_Int32 VCLXAccessibleEdit::getAccessibleChildCount() throw (RuntimeException, } -Reference< XAccessible > VCLXAccessibleEdit::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XAccessible > VCLXAccessibleEdit::getAccessibleChild( sal_Int32 i ) { OExternalLockGuard aGuard( this ); @@ -215,7 +215,7 @@ Reference< XAccessible > VCLXAccessibleEdit::getAccessibleChild( sal_Int32 i ) t } -sal_Int16 VCLXAccessibleEdit::getAccessibleRole( ) throw (RuntimeException, std::exception) +sal_Int16 VCLXAccessibleEdit::getAccessibleRole( ) { OExternalLockGuard aGuard( this ); @@ -233,7 +233,7 @@ sal_Int16 VCLXAccessibleEdit::getAccessibleRole( ) throw (RuntimeException, std // XAccessibleAction -sal_Int32 VCLXAccessibleEdit::getAccessibleActionCount( ) throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleEdit::getAccessibleActionCount( ) { OExternalLockGuard aGuard( this ); @@ -242,7 +242,7 @@ sal_Int32 VCLXAccessibleEdit::getAccessibleActionCount( ) throw (RuntimeExceptio } -sal_Bool VCLXAccessibleEdit::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool VCLXAccessibleEdit::doAccessibleAction ( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); @@ -261,7 +261,7 @@ sal_Bool VCLXAccessibleEdit::doAccessibleAction ( sal_Int32 nIndex ) throw (Inde } -OUString VCLXAccessibleEdit::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +OUString VCLXAccessibleEdit::getAccessibleActionDescription ( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); @@ -272,7 +272,7 @@ OUString VCLXAccessibleEdit::getAccessibleActionDescription ( sal_Int32 nIndex ) } -Reference< XAccessibleKeyBinding > VCLXAccessibleEdit::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XAccessibleKeyBinding > VCLXAccessibleEdit::getAccessibleActionKeyBinding( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); @@ -286,19 +286,19 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleEdit::getAccessibleActionKeyBin // XAccessibleText -sal_Int32 VCLXAccessibleEdit::getCaretPosition( ) throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleEdit::getCaretPosition( ) { return getSelectionEnd(); } -sal_Bool VCLXAccessibleEdit::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool VCLXAccessibleEdit::setCaretPosition( sal_Int32 nIndex ) { return setSelection( nIndex, nIndex ); } -sal_Unicode VCLXAccessibleEdit::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Unicode VCLXAccessibleEdit::getCharacter( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); @@ -306,7 +306,7 @@ sal_Unicode VCLXAccessibleEdit::getCharacter( sal_Int32 nIndex ) throw (IndexOut } -Sequence< PropertyValue > VCLXAccessibleEdit::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Sequence< PropertyValue > VCLXAccessibleEdit::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes ) { OExternalLockGuard aGuard( this ); Sequence< PropertyValue > aProperties = VCLXAccessibleTextComponent::getCharacterAttributes( nIndex, aRequestedAttributes ); @@ -352,7 +352,7 @@ Sequence< PropertyValue > VCLXAccessibleEdit::getCharacterAttributes( sal_Int32 } -awt::Rectangle VCLXAccessibleEdit::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +awt::Rectangle VCLXAccessibleEdit::getCharacterBounds( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); @@ -394,7 +394,7 @@ awt::Rectangle VCLXAccessibleEdit::getCharacterBounds( sal_Int32 nIndex ) throw } -sal_Int32 VCLXAccessibleEdit::getCharacterCount( ) throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleEdit::getCharacterCount( ) { OExternalLockGuard aGuard( this ); @@ -402,7 +402,7 @@ sal_Int32 VCLXAccessibleEdit::getCharacterCount( ) throw (RuntimeException, std } -sal_Int32 VCLXAccessibleEdit::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleEdit::getIndexAtPoint( const awt::Point& aPoint ) { OExternalLockGuard aGuard( this ); @@ -410,7 +410,7 @@ sal_Int32 VCLXAccessibleEdit::getIndexAtPoint( const awt::Point& aPoint ) throw } -OUString VCLXAccessibleEdit::getSelectedText( ) throw (RuntimeException, std::exception) +OUString VCLXAccessibleEdit::getSelectedText( ) { OExternalLockGuard aGuard( this ); @@ -418,7 +418,7 @@ OUString VCLXAccessibleEdit::getSelectedText( ) throw (RuntimeException, std::e } -sal_Int32 VCLXAccessibleEdit::getSelectionStart( ) throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleEdit::getSelectionStart( ) { OExternalLockGuard aGuard( this ); @@ -426,7 +426,7 @@ sal_Int32 VCLXAccessibleEdit::getSelectionStart( ) throw (RuntimeException, std } -sal_Int32 VCLXAccessibleEdit::getSelectionEnd( ) throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleEdit::getSelectionEnd( ) { OExternalLockGuard aGuard( this ); @@ -434,7 +434,7 @@ sal_Int32 VCLXAccessibleEdit::getSelectionEnd( ) throw (RuntimeException, std:: } -sal_Bool VCLXAccessibleEdit::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool VCLXAccessibleEdit::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { OExternalLockGuard aGuard( this ); @@ -456,7 +456,7 @@ sal_Bool VCLXAccessibleEdit::setSelection( sal_Int32 nStartIndex, sal_Int32 nEnd } -OUString VCLXAccessibleEdit::getText( ) throw (RuntimeException, std::exception) +OUString VCLXAccessibleEdit::getText( ) { OExternalLockGuard aGuard( this ); @@ -464,7 +464,7 @@ OUString VCLXAccessibleEdit::getText( ) throw (RuntimeException, std::exception } -OUString VCLXAccessibleEdit::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +OUString VCLXAccessibleEdit::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { OExternalLockGuard aGuard( this ); @@ -472,7 +472,7 @@ OUString VCLXAccessibleEdit::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEnd } -css::accessibility::TextSegment VCLXAccessibleEdit::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) +css::accessibility::TextSegment VCLXAccessibleEdit::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { OExternalLockGuard aGuard( this ); @@ -494,7 +494,7 @@ css::accessibility::TextSegment VCLXAccessibleEdit::getTextAtIndex( sal_Int32 nI } -css::accessibility::TextSegment VCLXAccessibleEdit::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) +css::accessibility::TextSegment VCLXAccessibleEdit::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { OExternalLockGuard aGuard( this ); @@ -502,7 +502,7 @@ css::accessibility::TextSegment VCLXAccessibleEdit::getTextBeforeIndex( sal_Int3 } -css::accessibility::TextSegment VCLXAccessibleEdit::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) +css::accessibility::TextSegment VCLXAccessibleEdit::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { OExternalLockGuard aGuard( this ); @@ -510,7 +510,7 @@ css::accessibility::TextSegment VCLXAccessibleEdit::getTextBehindIndex( sal_Int3 } -sal_Bool VCLXAccessibleEdit::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool VCLXAccessibleEdit::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { OExternalLockGuard aGuard( this ); @@ -521,7 +521,7 @@ sal_Bool VCLXAccessibleEdit::copyText( sal_Int32 nStartIndex, sal_Int32 nEndInde // XAccessibleEditableText -sal_Bool VCLXAccessibleEdit::cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool VCLXAccessibleEdit::cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { OExternalLockGuard aGuard( this ); @@ -529,7 +529,7 @@ sal_Bool VCLXAccessibleEdit::cutText( sal_Int32 nStartIndex, sal_Int32 nEndIndex } -sal_Bool VCLXAccessibleEdit::pasteText( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool VCLXAccessibleEdit::pasteText( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); @@ -564,7 +564,7 @@ sal_Bool VCLXAccessibleEdit::pasteText( sal_Int32 nIndex ) throw (IndexOutOfBoun } -sal_Bool VCLXAccessibleEdit::deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool VCLXAccessibleEdit::deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { OExternalLockGuard aGuard( this ); @@ -572,7 +572,7 @@ sal_Bool VCLXAccessibleEdit::deleteText( sal_Int32 nStartIndex, sal_Int32 nEndIn } -sal_Bool VCLXAccessibleEdit::insertText( const OUString& sText, sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool VCLXAccessibleEdit::insertText( const OUString& sText, sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); @@ -580,7 +580,7 @@ sal_Bool VCLXAccessibleEdit::insertText( const OUString& sText, sal_Int32 nIndex } -sal_Bool VCLXAccessibleEdit::replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool VCLXAccessibleEdit::replaceText( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const OUString& sReplacement ) { OExternalLockGuard aGuard( this ); @@ -606,7 +606,7 @@ sal_Bool VCLXAccessibleEdit::replaceText( sal_Int32 nStartIndex, sal_Int32 nEndI } -sal_Bool VCLXAccessibleEdit::setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const Sequence& ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool VCLXAccessibleEdit::setAttributes( sal_Int32 nStartIndex, sal_Int32 nEndIndex, const Sequence& ) { OExternalLockGuard aGuard( this ); @@ -617,7 +617,7 @@ sal_Bool VCLXAccessibleEdit::setAttributes( sal_Int32 nStartIndex, sal_Int32 nEn } -sal_Bool VCLXAccessibleEdit::setText( const OUString& sText ) throw (RuntimeException, std::exception) +sal_Bool VCLXAccessibleEdit::setText( const OUString& sText ) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx b/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx index 279c6e7e9129..2c4932e07694 100644 --- a/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx +++ b/accessibility/source/standard/vclxaccessiblefixedhyperlink.cxx @@ -39,13 +39,13 @@ VCLXAccessibleFixedHyperlink::~VCLXAccessibleFixedHyperlink() // XServiceInfo -OUString VCLXAccessibleFixedHyperlink::getImplementationName() throw (uno::RuntimeException, std::exception) +OUString VCLXAccessibleFixedHyperlink::getImplementationName() { return OUString( "com.sun.star.comp.toolkit.AccessibleFixedHyperlink" ); } -uno::Sequence< OUString > VCLXAccessibleFixedHyperlink::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) +uno::Sequence< OUString > VCLXAccessibleFixedHyperlink::getSupportedServiceNames() { return { "com.sun.star.awt.AccessibleFixedHyperlink" }; } diff --git a/accessibility/source/standard/vclxaccessiblefixedtext.cxx b/accessibility/source/standard/vclxaccessiblefixedtext.cxx index 6ac0adb3fb82..c84ddf9b3dda 100644 --- a/accessibility/source/standard/vclxaccessiblefixedtext.cxx +++ b/accessibility/source/standard/vclxaccessiblefixedtext.cxx @@ -56,13 +56,13 @@ void VCLXAccessibleFixedText::FillAccessibleStateSet( utl::AccessibleStateSetHel // XServiceInfo -OUString VCLXAccessibleFixedText::getImplementationName() throw (RuntimeException, std::exception) +OUString VCLXAccessibleFixedText::getImplementationName() { return OUString( "com.sun.star.comp.toolkit.AccessibleFixedText" ); } -Sequence< OUString > VCLXAccessibleFixedText::getSupportedServiceNames() throw (RuntimeException, std::exception) +Sequence< OUString > VCLXAccessibleFixedText::getSupportedServiceNames() { return { "com.sun.star.awt.AccessibleFixedText" }; } diff --git a/accessibility/source/standard/vclxaccessiblelist.cxx b/accessibility/source/standard/vclxaccessiblelist.cxx index f134ca7d29ca..4b86efb391df 100644 --- a/accessibility/source/standard/vclxaccessiblelist.cxx +++ b/accessibility/source/standard/vclxaccessiblelist.cxx @@ -43,7 +43,6 @@ namespace { /// @throws css::lang::IndexOutOfBoundsException void checkSelection_Impl( sal_Int32 _nIndex, const IComboListBoxHelper& _rListBox, bool bSelected ) - throw (css::lang::IndexOutOfBoundsException) { sal_Int32 nCount = bSelected ? (sal_Int32)_rListBox.GetSelectEntryCount() : (sal_Int32)_rListBox.GetEntryCount(); @@ -558,7 +557,6 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2(VCLXAccessibleList, VCLXAccessibleComponent, VC Reference SAL_CALL VCLXAccessibleList::getAccessibleContext() - throw (RuntimeException, std::exception) { return this; } @@ -567,7 +565,6 @@ Reference SAL_CALL // XAccessibleContext sal_Int32 SAL_CALL VCLXAccessibleList::getAccessibleChildCount() - throw (RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -580,7 +577,6 @@ sal_Int32 SAL_CALL VCLXAccessibleList::getAccessibleChildCount() } Reference SAL_CALL VCLXAccessibleList::getAccessibleChild (sal_Int32 i) - throw (IndexOutOfBoundsException, RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -603,7 +599,6 @@ Reference SAL_CALL VCLXAccessibleList::getAccessibleChild (sal_Int3 } Reference< XAccessible > SAL_CALL VCLXAccessibleList::getAccessibleParent( ) - throw (RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -611,7 +606,6 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleList::getAccessibleParent( ) } sal_Int32 SAL_CALL VCLXAccessibleList::getAccessibleIndexInParent() - throw (css::uno::RuntimeException, std::exception) { if (m_nIndexInParent != DEFAULT_INDEX_IN_PARENT) return m_nIndexInParent; @@ -620,20 +614,17 @@ sal_Int32 SAL_CALL VCLXAccessibleList::getAccessibleIndexInParent() } sal_Int16 SAL_CALL VCLXAccessibleList::getAccessibleRole() - throw (RuntimeException, std::exception) { return AccessibleRole::LIST; } // XServiceInfo OUString VCLXAccessibleList::getImplementationName() - throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.toolkit.AccessibleList" ); } Sequence< OUString > VCLXAccessibleList::getSupportedServiceNames() - throw (RuntimeException, std::exception) { Sequence< OUString > aNames = VCLXAccessibleComponent::getSupportedServiceNames(); sal_Int32 nLength = aNames.getLength(); @@ -775,7 +766,7 @@ void VCLXAccessibleList::UpdateSelection_Impl(sal_Int32) // XAccessibleSelection -void SAL_CALL VCLXAccessibleList::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +void SAL_CALL VCLXAccessibleList::selectAccessibleChild( sal_Int32 nChildIndex ) { bool bNotify = false; @@ -800,7 +791,7 @@ void SAL_CALL VCLXAccessibleList::selectAccessibleChild( sal_Int32 nChildIndex ) UpdateSelection_Impl(); } -sal_Bool SAL_CALL VCLXAccessibleList::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool SAL_CALL VCLXAccessibleList::isAccessibleChildSelected( sal_Int32 nChildIndex ) { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -815,7 +806,7 @@ sal_Bool SAL_CALL VCLXAccessibleList::isAccessibleChildSelected( sal_Int32 nChil return bRet; } -void SAL_CALL VCLXAccessibleList::clearAccessibleSelection( ) throw (RuntimeException, std::exception) +void SAL_CALL VCLXAccessibleList::clearAccessibleSelection( ) { bool bNotify = false; @@ -834,7 +825,7 @@ void SAL_CALL VCLXAccessibleList::clearAccessibleSelection( ) throw (RuntimeExc UpdateSelection_Impl(); } -void SAL_CALL VCLXAccessibleList::selectAllAccessibleChildren( ) throw (RuntimeException, std::exception) +void SAL_CALL VCLXAccessibleList::selectAllAccessibleChildren( ) { bool bNotify = false; @@ -859,7 +850,7 @@ void SAL_CALL VCLXAccessibleList::selectAllAccessibleChildren( ) throw (Runtime UpdateSelection_Impl(); } -sal_Int32 SAL_CALL VCLXAccessibleList::getSelectedAccessibleChildCount( ) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL VCLXAccessibleList::getSelectedAccessibleChildCount( ) { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -870,7 +861,7 @@ sal_Int32 SAL_CALL VCLXAccessibleList::getSelectedAccessibleChildCount( ) throw return nCount; } -Reference< XAccessible > SAL_CALL VCLXAccessibleList::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XAccessible > SAL_CALL VCLXAccessibleList::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -884,7 +875,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleList::getSelectedAccessibleChild return nullptr; } -void SAL_CALL VCLXAccessibleList::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +void SAL_CALL VCLXAccessibleList::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) { bool bNotify = false; @@ -909,7 +900,7 @@ void SAL_CALL VCLXAccessibleList::deselectAccessibleChild( sal_Int32 nSelectedCh UpdateSelection_Impl(); } -awt::Rectangle VCLXAccessibleList::implGetBounds() throw (uno::RuntimeException) +awt::Rectangle VCLXAccessibleList::implGetBounds() { awt::Rectangle aBounds ( 0, 0, 0, 0 ); if ( m_pListBoxHelper @@ -939,7 +930,7 @@ awt::Rectangle VCLXAccessibleList::implGetBounds() throw (uno::RuntimeException) } -awt::Point VCLXAccessibleList::getLocationOnScreen( ) throw (uno::RuntimeException, std::exception) +awt::Point VCLXAccessibleList::getLocationOnScreen( ) { SolarMutexGuard aSolarGuard; ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); diff --git a/accessibility/source/standard/vclxaccessiblelistbox.cxx b/accessibility/source/standard/vclxaccessiblelistbox.cxx index 446b140ab981..ba9e8c601208 100644 --- a/accessibility/source/standard/vclxaccessiblelistbox.cxx +++ b/accessibility/source/standard/vclxaccessiblelistbox.cxx @@ -60,14 +60,12 @@ bool VCLXAccessibleListBox::IsValid() const // XServiceInfo OUString VCLXAccessibleListBox::getImplementationName() - throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.toolkit.AccessibleListBox" ); } Sequence< OUString > VCLXAccessibleListBox::getSupportedServiceNames() - throw (RuntimeException, std::exception) { Sequence< OUString > aNames = VCLXAccessibleBox::getSupportedServiceNames(); sal_Int32 nLength = aNames.getLength(); diff --git a/accessibility/source/standard/vclxaccessiblelistitem.cxx b/accessibility/source/standard/vclxaccessiblelistitem.cxx index 07b7ea94a49e..61f38d849e91 100644 --- a/accessibility/source/standard/vclxaccessiblelistitem.cxx +++ b/accessibility/source/standard/vclxaccessiblelistitem.cxx @@ -44,7 +44,7 @@ namespace { /// @throws css::lang::IndexOutOfBoundsException - void checkIndex_Impl( sal_Int32 _nIndex, const OUString& _sText ) throw (css::lang::IndexOutOfBoundsException) + void checkIndex_Impl( sal_Int32 _nIndex, const OUString& _sText ) { if ( _nIndex < 0 || _nIndex > _sText.getLength() ) throw css::lang::IndexOutOfBoundsException(); @@ -143,7 +143,7 @@ void VCLXAccessibleListItem::implGetSelection( sal_Int32& nStartIndex, sal_Int32 // XTypeProvider -Sequence< sal_Int8 > VCLXAccessibleListItem::getImplementationId() throw (RuntimeException, std::exception) +Sequence< sal_Int8 > VCLXAccessibleListItem::getImplementationId() { return css::uno::Sequence(); } @@ -175,17 +175,17 @@ void SAL_CALL VCLXAccessibleListItem::disposing() // XServiceInfo -OUString VCLXAccessibleListItem::getImplementationName() throw (RuntimeException, std::exception) +OUString VCLXAccessibleListItem::getImplementationName() { return OUString( "com.sun.star.comp.toolkit.AccessibleListItem" ); } -sal_Bool VCLXAccessibleListItem::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) +sal_Bool VCLXAccessibleListItem::supportsService( const OUString& rServiceName ) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > VCLXAccessibleListItem::getSupportedServiceNames() throw (RuntimeException, std::exception) +Sequence< OUString > VCLXAccessibleListItem::getSupportedServiceNames() { return {"com.sun.star.accessibility.AccessibleContext", "com.sun.star.accessibility.AccessibleComponent", @@ -194,49 +194,49 @@ Sequence< OUString > VCLXAccessibleListItem::getSupportedServiceNames() throw (R // XAccessible -Reference< XAccessibleContext > SAL_CALL VCLXAccessibleListItem::getAccessibleContext( ) throw (RuntimeException, std::exception) +Reference< XAccessibleContext > SAL_CALL VCLXAccessibleListItem::getAccessibleContext( ) { return this; } // XAccessibleContext -sal_Int32 SAL_CALL VCLXAccessibleListItem::getAccessibleChildCount( ) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL VCLXAccessibleListItem::getAccessibleChildCount( ) { return 0; } -Reference< XAccessible > SAL_CALL VCLXAccessibleListItem::getAccessibleChild( sal_Int32 ) throw (RuntimeException, std::exception) +Reference< XAccessible > SAL_CALL VCLXAccessibleListItem::getAccessibleChild( sal_Int32 ) { return Reference< XAccessible >(); } -Reference< XAccessible > SAL_CALL VCLXAccessibleListItem::getAccessibleParent( ) throw (RuntimeException, std::exception) +Reference< XAccessible > SAL_CALL VCLXAccessibleListItem::getAccessibleParent( ) { ::osl::MutexGuard aGuard( m_aMutex ); return m_xParent.get(); } -sal_Int32 SAL_CALL VCLXAccessibleListItem::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL VCLXAccessibleListItem::getAccessibleIndexInParent( ) { ::osl::MutexGuard aGuard( m_aMutex ); return m_nIndexInParent; } -sal_Int16 SAL_CALL VCLXAccessibleListItem::getAccessibleRole( ) throw (RuntimeException, std::exception) +sal_Int16 SAL_CALL VCLXAccessibleListItem::getAccessibleRole( ) { return AccessibleRole::LIST_ITEM; // return AccessibleRole::LABEL; } -OUString SAL_CALL VCLXAccessibleListItem::getAccessibleDescription( ) throw (RuntimeException, std::exception) +OUString SAL_CALL VCLXAccessibleListItem::getAccessibleDescription( ) { // no description for every item return OUString(); } -OUString SAL_CALL VCLXAccessibleListItem::getAccessibleName( ) throw (RuntimeException, std::exception) +OUString SAL_CALL VCLXAccessibleListItem::getAccessibleName( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -244,14 +244,14 @@ OUString SAL_CALL VCLXAccessibleListItem::getAccessibleName( ) throw (RuntimeEx return implGetText(); } -Reference< XAccessibleRelationSet > SAL_CALL VCLXAccessibleListItem::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) +Reference< XAccessibleRelationSet > SAL_CALL VCLXAccessibleListItem::getAccessibleRelationSet( ) { utl::AccessibleRelationSetHelper* pRelationSetHelper = new utl::AccessibleRelationSetHelper; Reference< XAccessibleRelationSet > xSet = pRelationSetHelper; return xSet; } -Reference< XAccessibleStateSet > SAL_CALL VCLXAccessibleListItem::getAccessibleStateSet( ) throw (RuntimeException, std::exception) +Reference< XAccessibleStateSet > SAL_CALL VCLXAccessibleListItem::getAccessibleStateSet( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -284,7 +284,7 @@ Reference< XAccessibleStateSet > SAL_CALL VCLXAccessibleListItem::getAccessibleS return xStateSet; } -Locale SAL_CALL VCLXAccessibleListItem::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) +Locale SAL_CALL VCLXAccessibleListItem::getLocale( ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -294,7 +294,7 @@ Locale SAL_CALL VCLXAccessibleListItem::getLocale( ) throw (IllegalAccessibleCo // XAccessibleComponent -sal_Bool SAL_CALL VCLXAccessibleListItem::containsPoint( const awt::Point& _aPoint ) throw (RuntimeException, std::exception) +sal_Bool SAL_CALL VCLXAccessibleListItem::containsPoint( const awt::Point& _aPoint ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -310,12 +310,12 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::containsPoint( const awt::Point& _aPoi return bInside; } -Reference< XAccessible > SAL_CALL VCLXAccessibleListItem::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException, std::exception) +Reference< XAccessible > SAL_CALL VCLXAccessibleListItem::getAccessibleAtPoint( const awt::Point& ) { return Reference< XAccessible >(); } -awt::Rectangle SAL_CALL VCLXAccessibleListItem::getBounds( ) throw (RuntimeException, std::exception) +awt::Rectangle SAL_CALL VCLXAccessibleListItem::getBounds( ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -328,7 +328,7 @@ awt::Rectangle SAL_CALL VCLXAccessibleListItem::getBounds( ) throw (RuntimeExce return aRect; } -awt::Point SAL_CALL VCLXAccessibleListItem::getLocation( ) throw (RuntimeException, std::exception) +awt::Point SAL_CALL VCLXAccessibleListItem::getLocation( ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -343,7 +343,7 @@ awt::Point SAL_CALL VCLXAccessibleListItem::getLocation( ) throw (RuntimeExcept return AWTPoint( aPoint ); } -awt::Point SAL_CALL VCLXAccessibleListItem::getLocationOnScreen( ) throw (RuntimeException, std::exception) +awt::Point SAL_CALL VCLXAccessibleListItem::getLocationOnScreen( ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -359,7 +359,7 @@ awt::Point SAL_CALL VCLXAccessibleListItem::getLocationOnScreen( ) throw (Runti return AWTPoint( aPoint ); } -awt::Size SAL_CALL VCLXAccessibleListItem::getSize( ) throw (RuntimeException, std::exception) +awt::Size SAL_CALL VCLXAccessibleListItem::getSize( ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -372,19 +372,19 @@ awt::Size SAL_CALL VCLXAccessibleListItem::getSize( ) throw (RuntimeException, return AWTSize( aSize ); } -void SAL_CALL VCLXAccessibleListItem::grabFocus( ) throw (RuntimeException, std::exception) +void SAL_CALL VCLXAccessibleListItem::grabFocus( ) { // no focus for each item } // XAccessibleText -sal_Int32 SAL_CALL VCLXAccessibleListItem::getCaretPosition() throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL VCLXAccessibleListItem::getCaretPosition() { return -1; } -sal_Bool SAL_CALL VCLXAccessibleListItem::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool SAL_CALL VCLXAccessibleListItem::setCaretPosition( sal_Int32 nIndex ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -395,7 +395,7 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::setCaretPosition( sal_Int32 nIndex ) t return false; } -sal_Unicode SAL_CALL VCLXAccessibleListItem::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Unicode SAL_CALL VCLXAccessibleListItem::getCharacter( sal_Int32 nIndex ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -403,7 +403,7 @@ sal_Unicode SAL_CALL VCLXAccessibleListItem::getCharacter( sal_Int32 nIndex ) th return OCommonAccessibleText::getCharacter( nIndex ); } -Sequence< PropertyValue > SAL_CALL VCLXAccessibleListItem::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Sequence< PropertyValue > SAL_CALL VCLXAccessibleListItem::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -415,7 +415,7 @@ Sequence< PropertyValue > SAL_CALL VCLXAccessibleListItem::getCharacterAttribute return Sequence< PropertyValue >(); } -awt::Rectangle SAL_CALL VCLXAccessibleListItem::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +awt::Rectangle SAL_CALL VCLXAccessibleListItem::getCharacterBounds( sal_Int32 nIndex ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -437,7 +437,7 @@ awt::Rectangle SAL_CALL VCLXAccessibleListItem::getCharacterBounds( sal_Int32 nI return aBounds; } -sal_Int32 SAL_CALL VCLXAccessibleListItem::getCharacterCount() throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL VCLXAccessibleListItem::getCharacterCount() { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -445,7 +445,7 @@ sal_Int32 SAL_CALL VCLXAccessibleListItem::getCharacterCount() throw (RuntimeExc return OCommonAccessibleText::getCharacterCount(); } -sal_Int32 SAL_CALL VCLXAccessibleListItem::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL VCLXAccessibleListItem::getIndexAtPoint( const awt::Point& aPoint ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -465,7 +465,7 @@ sal_Int32 SAL_CALL VCLXAccessibleListItem::getIndexAtPoint( const awt::Point& aP return nIndex; } -OUString SAL_CALL VCLXAccessibleListItem::getSelectedText() throw (RuntimeException, std::exception) +OUString SAL_CALL VCLXAccessibleListItem::getSelectedText() { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -473,7 +473,7 @@ OUString SAL_CALL VCLXAccessibleListItem::getSelectedText() throw (RuntimeExcept return OCommonAccessibleText::getSelectedText(); } -sal_Int32 SAL_CALL VCLXAccessibleListItem::getSelectionStart() throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL VCLXAccessibleListItem::getSelectionStart() { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -481,7 +481,7 @@ sal_Int32 SAL_CALL VCLXAccessibleListItem::getSelectionStart() throw (RuntimeExc return OCommonAccessibleText::getSelectionStart(); } -sal_Int32 SAL_CALL VCLXAccessibleListItem::getSelectionEnd() throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL VCLXAccessibleListItem::getSelectionEnd() { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -489,7 +489,7 @@ sal_Int32 SAL_CALL VCLXAccessibleListItem::getSelectionEnd() throw (RuntimeExcep return OCommonAccessibleText::getSelectionEnd(); } -sal_Bool SAL_CALL VCLXAccessibleListItem::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool SAL_CALL VCLXAccessibleListItem::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -500,7 +500,7 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::setSelection( sal_Int32 nStartIndex, s return false; } -OUString SAL_CALL VCLXAccessibleListItem::getText() throw (RuntimeException, std::exception) +OUString SAL_CALL VCLXAccessibleListItem::getText() { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -508,7 +508,7 @@ OUString SAL_CALL VCLXAccessibleListItem::getText() throw (RuntimeException, std return OCommonAccessibleText::getText(); } -OUString SAL_CALL VCLXAccessibleListItem::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +OUString SAL_CALL VCLXAccessibleListItem::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -516,7 +516,7 @@ OUString SAL_CALL VCLXAccessibleListItem::getTextRange( sal_Int32 nStartIndex, s return OCommonAccessibleText::getTextRange( nStartIndex, nEndIndex ); } -css::accessibility::TextSegment SAL_CALL VCLXAccessibleListItem::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) +css::accessibility::TextSegment SAL_CALL VCLXAccessibleListItem::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -524,7 +524,7 @@ css::accessibility::TextSegment SAL_CALL VCLXAccessibleListItem::getTextAtIndex( return OCommonAccessibleText::getTextAtIndex( nIndex, aTextType ); } -css::accessibility::TextSegment SAL_CALL VCLXAccessibleListItem::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) +css::accessibility::TextSegment SAL_CALL VCLXAccessibleListItem::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -532,7 +532,7 @@ css::accessibility::TextSegment SAL_CALL VCLXAccessibleListItem::getTextBeforeIn return OCommonAccessibleText::getTextBeforeIndex( nIndex, aTextType ); } -css::accessibility::TextSegment SAL_CALL VCLXAccessibleListItem::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) +css::accessibility::TextSegment SAL_CALL VCLXAccessibleListItem::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -540,7 +540,7 @@ css::accessibility::TextSegment SAL_CALL VCLXAccessibleListItem::getTextBehindIn return OCommonAccessibleText::getTextBehindIndex( nIndex, aTextType ); } -sal_Bool SAL_CALL VCLXAccessibleListItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool SAL_CALL VCLXAccessibleListItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); @@ -573,7 +573,7 @@ sal_Bool SAL_CALL VCLXAccessibleListItem::copyText( sal_Int32 nStartIndex, sal_I // XAccessibleEventBroadcaster -void SAL_CALL VCLXAccessibleListItem::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException, std::exception) +void SAL_CALL VCLXAccessibleListItem::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) { if (xListener.is()) { @@ -583,7 +583,7 @@ void SAL_CALL VCLXAccessibleListItem::addAccessibleEventListener( const Referenc } } -void SAL_CALL VCLXAccessibleListItem::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) throw (RuntimeException, std::exception) +void SAL_CALL VCLXAccessibleListItem::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) { if ( xListener.is() && m_nClientId ) { @@ -609,7 +609,6 @@ void SAL_CALL VCLXAccessibleListItem::removeAccessibleEventListener( const Refer // initial implementation and has to be substituted by code that determines // the color that is actually used. sal_Int32 SAL_CALL VCLXAccessibleListItem::getForeground() - throw (css::uno::RuntimeException, std::exception) { return COL_BLACK; } @@ -618,7 +617,6 @@ sal_Int32 SAL_CALL VCLXAccessibleListItem::getForeground() // initial implementation and has to be substituted by code that determines // the color that is actually used. sal_Int32 SAL_CALL VCLXAccessibleListItem::getBackground() - throw (css::uno::RuntimeException, std::exception) { return COL_WHITE; } diff --git a/accessibility/source/standard/vclxaccessiblemenu.cxx b/accessibility/source/standard/vclxaccessiblemenu.cxx index 536e2a967370..a3a5774e1ff2 100644 --- a/accessibility/source/standard/vclxaccessiblemenu.cxx +++ b/accessibility/source/standard/vclxaccessiblemenu.cxx @@ -85,13 +85,13 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleMenu, VCLXAccessibleMenuItem, VC // XServiceInfo -OUString VCLXAccessibleMenu::getImplementationName() throw (RuntimeException, std::exception) +OUString VCLXAccessibleMenu::getImplementationName() { return OUString( "com.sun.star.comp.toolkit.AccessibleMenu" ); } -Sequence< OUString > VCLXAccessibleMenu::getSupportedServiceNames() throw (RuntimeException, std::exception) +Sequence< OUString > VCLXAccessibleMenu::getSupportedServiceNames() { return { "com.sun.star.awt.AccessibleMenu" }; } @@ -100,7 +100,7 @@ Sequence< OUString > VCLXAccessibleMenu::getSupportedServiceNames() throw (Runti // XAccessibleContext -sal_Int32 VCLXAccessibleMenu::getAccessibleChildCount( ) throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleMenu::getAccessibleChildCount( ) { OExternalLockGuard aGuard( this ); @@ -108,7 +108,7 @@ sal_Int32 VCLXAccessibleMenu::getAccessibleChildCount( ) throw (RuntimeExceptio } -Reference< XAccessible > VCLXAccessibleMenu::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XAccessible > VCLXAccessibleMenu::getAccessibleChild( sal_Int32 i ) { OExternalLockGuard aGuard( this ); @@ -119,7 +119,7 @@ Reference< XAccessible > VCLXAccessibleMenu::getAccessibleChild( sal_Int32 i ) t } -sal_Int16 VCLXAccessibleMenu::getAccessibleRole( ) throw (RuntimeException, std::exception) +sal_Int16 VCLXAccessibleMenu::getAccessibleRole( ) { OExternalLockGuard aGuard( this ); @@ -130,7 +130,7 @@ sal_Int16 VCLXAccessibleMenu::getAccessibleRole( ) throw (RuntimeException, std // XAccessibleComponent -Reference< XAccessible > VCLXAccessibleMenu::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException, std::exception) +Reference< XAccessible > VCLXAccessibleMenu::getAccessibleAtPoint( const awt::Point& rPoint ) { OExternalLockGuard aGuard( this ); @@ -141,7 +141,7 @@ Reference< XAccessible > VCLXAccessibleMenu::getAccessibleAtPoint( const awt::Po // XAccessibleSelection -void VCLXAccessibleMenu::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +void VCLXAccessibleMenu::selectAccessibleChild( sal_Int32 nChildIndex ) { OExternalLockGuard aGuard( this ); @@ -152,7 +152,7 @@ void VCLXAccessibleMenu::selectAccessibleChild( sal_Int32 nChildIndex ) throw (I } -sal_Bool VCLXAccessibleMenu::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool VCLXAccessibleMenu::isAccessibleChildSelected( sal_Int32 nChildIndex ) { OExternalLockGuard aGuard( this ); @@ -163,7 +163,7 @@ sal_Bool VCLXAccessibleMenu::isAccessibleChildSelected( sal_Int32 nChildIndex ) } -void VCLXAccessibleMenu::clearAccessibleSelection( ) throw (RuntimeException, std::exception) +void VCLXAccessibleMenu::clearAccessibleSelection( ) { OExternalLockGuard aGuard( this ); @@ -171,13 +171,13 @@ void VCLXAccessibleMenu::clearAccessibleSelection( ) throw (RuntimeException, s } -void VCLXAccessibleMenu::selectAllAccessibleChildren( ) throw (RuntimeException, std::exception) +void VCLXAccessibleMenu::selectAllAccessibleChildren( ) { // This method makes no sense in a menu, and so does nothing. } -sal_Int32 VCLXAccessibleMenu::getSelectedAccessibleChildCount( ) throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleMenu::getSelectedAccessibleChildCount( ) { OExternalLockGuard aGuard( this ); @@ -193,7 +193,7 @@ sal_Int32 VCLXAccessibleMenu::getSelectedAccessibleChildCount( ) throw (Runtime } -Reference< XAccessible > VCLXAccessibleMenu::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XAccessible > VCLXAccessibleMenu::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) { OExternalLockGuard aGuard( this ); @@ -215,7 +215,7 @@ Reference< XAccessible > VCLXAccessibleMenu::getSelectedAccessibleChild( sal_Int } -void VCLXAccessibleMenu::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +void VCLXAccessibleMenu::deselectAccessibleChild( sal_Int32 nChildIndex ) { OExternalLockGuard aGuard( this ); @@ -226,7 +226,7 @@ void VCLXAccessibleMenu::deselectAccessibleChild( sal_Int32 nChildIndex ) throw } -OUString VCLXAccessibleMenu::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +OUString VCLXAccessibleMenu::getAccessibleActionDescription ( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessiblemenubar.cxx b/accessibility/source/standard/vclxaccessiblemenubar.cxx index f1855c59c3a4..ba5715e5d9de 100644 --- a/accessibility/source/standard/vclxaccessiblemenubar.cxx +++ b/accessibility/source/standard/vclxaccessiblemenubar.cxx @@ -124,13 +124,13 @@ void VCLXAccessibleMenuBar::disposing() // XServiceInfo -OUString VCLXAccessibleMenuBar::getImplementationName() throw (RuntimeException, std::exception) +OUString VCLXAccessibleMenuBar::getImplementationName() { return OUString( "com.sun.star.comp.toolkit.AccessibleMenuBar" ); } -Sequence< OUString > VCLXAccessibleMenuBar::getSupportedServiceNames() throw (RuntimeException, std::exception) +Sequence< OUString > VCLXAccessibleMenuBar::getSupportedServiceNames() { return { "com.sun.star.awt.AccessibleMenuBar" }; } @@ -139,7 +139,7 @@ Sequence< OUString > VCLXAccessibleMenuBar::getSupportedServiceNames() throw (Ru // XAccessibleContext -sal_Int32 VCLXAccessibleMenuBar::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleMenuBar::getAccessibleIndexInParent( ) { OExternalLockGuard aGuard( this ); @@ -170,7 +170,7 @@ sal_Int32 VCLXAccessibleMenuBar::getAccessibleIndexInParent( ) throw (RuntimeEx } -sal_Int16 VCLXAccessibleMenuBar::getAccessibleRole( ) throw (RuntimeException, std::exception) +sal_Int16 VCLXAccessibleMenuBar::getAccessibleRole( ) { OExternalLockGuard aGuard( this ); @@ -181,7 +181,7 @@ sal_Int16 VCLXAccessibleMenuBar::getAccessibleRole( ) throw (RuntimeException, // XAccessibleExtendedComponent -sal_Int32 VCLXAccessibleMenuBar::getBackground( ) throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleMenuBar::getBackground( ) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessiblemenuitem.cxx b/accessibility/source/standard/vclxaccessiblemenuitem.cxx index dcb14fb526f0..26fb4613136e 100644 --- a/accessibility/source/standard/vclxaccessiblemenuitem.cxx +++ b/accessibility/source/standard/vclxaccessiblemenuitem.cxx @@ -153,13 +153,13 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleMenuItem, OAccessibleMenuItemCom // XServiceInfo -OUString VCLXAccessibleMenuItem::getImplementationName() throw (RuntimeException, std::exception) +OUString VCLXAccessibleMenuItem::getImplementationName() { return OUString( "com.sun.star.comp.toolkit.AccessibleMenuItem" ); } -Sequence< OUString > VCLXAccessibleMenuItem::getSupportedServiceNames() throw (RuntimeException, std::exception) +Sequence< OUString > VCLXAccessibleMenuItem::getSupportedServiceNames() { return { "com.sun.star.awt.AccessibleMenuItem" }; } @@ -168,7 +168,7 @@ Sequence< OUString > VCLXAccessibleMenuItem::getSupportedServiceNames() throw (R // XAccessibleContext -sal_Int16 VCLXAccessibleMenuItem::getAccessibleRole( ) throw (RuntimeException, std::exception) +sal_Int16 VCLXAccessibleMenuItem::getAccessibleRole( ) { OExternalLockGuard aGuard( this ); // IA2 CWS. MT: We had the additional roles in UAA for ever, but never used them anywhere. @@ -190,7 +190,7 @@ sal_Int16 VCLXAccessibleMenuItem::getAccessibleRole( ) throw (RuntimeException, // XAccessibleText -sal_Int32 VCLXAccessibleMenuItem::getCaretPosition() throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleMenuItem::getCaretPosition() { OExternalLockGuard aGuard( this ); @@ -198,7 +198,7 @@ sal_Int32 VCLXAccessibleMenuItem::getCaretPosition() throw (RuntimeException, st } -sal_Bool VCLXAccessibleMenuItem::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool VCLXAccessibleMenuItem::setCaretPosition( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); @@ -210,7 +210,7 @@ sal_Bool VCLXAccessibleMenuItem::setCaretPosition( sal_Int32 nIndex ) throw (Ind } -sal_Unicode VCLXAccessibleMenuItem::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Unicode VCLXAccessibleMenuItem::getCharacter( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); @@ -218,7 +218,7 @@ sal_Unicode VCLXAccessibleMenuItem::getCharacter( sal_Int32 nIndex ) throw (Inde } -Sequence< PropertyValue > VCLXAccessibleMenuItem::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Sequence< PropertyValue > VCLXAccessibleMenuItem::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes ) { OExternalLockGuard aGuard( this ); @@ -235,7 +235,7 @@ Sequence< PropertyValue > VCLXAccessibleMenuItem::getCharacterAttributes( sal_In } -awt::Rectangle VCLXAccessibleMenuItem::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +awt::Rectangle VCLXAccessibleMenuItem::getCharacterBounds( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); @@ -256,7 +256,7 @@ awt::Rectangle VCLXAccessibleMenuItem::getCharacterBounds( sal_Int32 nIndex ) th } -sal_Int32 VCLXAccessibleMenuItem::getCharacterCount() throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleMenuItem::getCharacterCount() { OExternalLockGuard aGuard( this ); @@ -264,7 +264,7 @@ sal_Int32 VCLXAccessibleMenuItem::getCharacterCount() throw (RuntimeException, s } -sal_Int32 VCLXAccessibleMenuItem::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleMenuItem::getIndexAtPoint( const awt::Point& aPoint ) { OExternalLockGuard aGuard( this ); @@ -284,7 +284,7 @@ sal_Int32 VCLXAccessibleMenuItem::getIndexAtPoint( const awt::Point& aPoint ) th } -OUString VCLXAccessibleMenuItem::getSelectedText() throw (RuntimeException, std::exception) +OUString VCLXAccessibleMenuItem::getSelectedText() { OExternalLockGuard aGuard( this ); @@ -292,7 +292,7 @@ OUString VCLXAccessibleMenuItem::getSelectedText() throw (RuntimeException, std: } -sal_Int32 VCLXAccessibleMenuItem::getSelectionStart() throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleMenuItem::getSelectionStart() { OExternalLockGuard aGuard( this ); @@ -300,7 +300,7 @@ sal_Int32 VCLXAccessibleMenuItem::getSelectionStart() throw (RuntimeException, s } -sal_Int32 VCLXAccessibleMenuItem::getSelectionEnd() throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleMenuItem::getSelectionEnd() { OExternalLockGuard aGuard( this ); @@ -308,7 +308,7 @@ sal_Int32 VCLXAccessibleMenuItem::getSelectionEnd() throw (RuntimeException, std } -sal_Bool VCLXAccessibleMenuItem::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool VCLXAccessibleMenuItem::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { OExternalLockGuard aGuard( this ); @@ -319,7 +319,7 @@ sal_Bool VCLXAccessibleMenuItem::setSelection( sal_Int32 nStartIndex, sal_Int32 } -OUString VCLXAccessibleMenuItem::getText() throw (RuntimeException, std::exception) +OUString VCLXAccessibleMenuItem::getText() { OExternalLockGuard aGuard( this ); @@ -327,7 +327,7 @@ OUString VCLXAccessibleMenuItem::getText() throw (RuntimeException, std::excepti } -OUString VCLXAccessibleMenuItem::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +OUString VCLXAccessibleMenuItem::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { OExternalLockGuard aGuard( this ); @@ -335,7 +335,7 @@ OUString VCLXAccessibleMenuItem::getTextRange( sal_Int32 nStartIndex, sal_Int32 } -css::accessibility::TextSegment VCLXAccessibleMenuItem::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) +css::accessibility::TextSegment VCLXAccessibleMenuItem::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { OExternalLockGuard aGuard( this ); @@ -343,7 +343,7 @@ css::accessibility::TextSegment VCLXAccessibleMenuItem::getTextAtIndex( sal_Int3 } -css::accessibility::TextSegment VCLXAccessibleMenuItem::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) +css::accessibility::TextSegment VCLXAccessibleMenuItem::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { OExternalLockGuard aGuard( this ); @@ -351,7 +351,7 @@ css::accessibility::TextSegment VCLXAccessibleMenuItem::getTextBeforeIndex( sal_ } -css::accessibility::TextSegment VCLXAccessibleMenuItem::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) +css::accessibility::TextSegment VCLXAccessibleMenuItem::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { OExternalLockGuard aGuard( this ); @@ -359,7 +359,7 @@ css::accessibility::TextSegment VCLXAccessibleMenuItem::getTextBehindIndex( sal_ } -sal_Bool VCLXAccessibleMenuItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool VCLXAccessibleMenuItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { OExternalLockGuard aGuard( this ); @@ -395,7 +395,7 @@ sal_Bool VCLXAccessibleMenuItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEnd // XAccessibleAction -sal_Int32 VCLXAccessibleMenuItem::getAccessibleActionCount( ) throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleMenuItem::getAccessibleActionCount( ) { OExternalLockGuard aGuard( this ); @@ -403,7 +403,7 @@ sal_Int32 VCLXAccessibleMenuItem::getAccessibleActionCount( ) throw (RuntimeExce } -sal_Bool VCLXAccessibleMenuItem::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool VCLXAccessibleMenuItem::doAccessibleAction ( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); @@ -416,7 +416,7 @@ sal_Bool VCLXAccessibleMenuItem::doAccessibleAction ( sal_Int32 nIndex ) throw ( } -OUString VCLXAccessibleMenuItem::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +OUString VCLXAccessibleMenuItem::getAccessibleActionDescription ( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); @@ -427,7 +427,7 @@ OUString VCLXAccessibleMenuItem::getAccessibleActionDescription ( sal_Int32 nInd } -Reference< XAccessibleKeyBinding > VCLXAccessibleMenuItem::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XAccessibleKeyBinding > VCLXAccessibleMenuItem::getAccessibleActionKeyBinding( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); @@ -506,7 +506,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleMenuItem::getAccessibleActionKe // XAccessibleValue -Any VCLXAccessibleMenuItem::getCurrentValue( ) throw (RuntimeException, std::exception) +Any VCLXAccessibleMenuItem::getCurrentValue( ) { OExternalLockGuard aGuard( this ); @@ -520,7 +520,7 @@ Any VCLXAccessibleMenuItem::getCurrentValue( ) throw (RuntimeException, std::ex } -sal_Bool VCLXAccessibleMenuItem::setCurrentValue( const Any& aNumber ) throw (RuntimeException, std::exception) +sal_Bool VCLXAccessibleMenuItem::setCurrentValue( const Any& aNumber ) { OExternalLockGuard aGuard( this ); @@ -543,7 +543,7 @@ sal_Bool VCLXAccessibleMenuItem::setCurrentValue( const Any& aNumber ) throw (Ru } -Any VCLXAccessibleMenuItem::getMaximumValue( ) throw (RuntimeException, std::exception) +Any VCLXAccessibleMenuItem::getMaximumValue( ) { OExternalLockGuard aGuard( this ); @@ -554,7 +554,7 @@ Any VCLXAccessibleMenuItem::getMaximumValue( ) throw (RuntimeException, std::ex } -Any VCLXAccessibleMenuItem::getMinimumValue( ) throw (RuntimeException, std::exception) +Any VCLXAccessibleMenuItem::getMinimumValue( ) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessiblemenuseparator.cxx b/accessibility/source/standard/vclxaccessiblemenuseparator.cxx index 3e92cf818ddc..ca7162de520f 100644 --- a/accessibility/source/standard/vclxaccessiblemenuseparator.cxx +++ b/accessibility/source/standard/vclxaccessiblemenuseparator.cxx @@ -45,13 +45,13 @@ VCLXAccessibleMenuSeparator::~VCLXAccessibleMenuSeparator() // XServiceInfo -OUString VCLXAccessibleMenuSeparator::getImplementationName() throw (RuntimeException, std::exception) +OUString VCLXAccessibleMenuSeparator::getImplementationName() { return OUString( "com.sun.star.comp.toolkit.AccessibleMenuSeparator" ); } -Sequence< OUString > VCLXAccessibleMenuSeparator::getSupportedServiceNames() throw (RuntimeException, std::exception) +Sequence< OUString > VCLXAccessibleMenuSeparator::getSupportedServiceNames() { return { "com.sun.star.awt.AccessibleMenuSeparator" }; } @@ -60,7 +60,7 @@ Sequence< OUString > VCLXAccessibleMenuSeparator::getSupportedServiceNames() thr // XAccessibleContext -sal_Int16 VCLXAccessibleMenuSeparator::getAccessibleRole( ) throw (RuntimeException, std::exception) +sal_Int16 VCLXAccessibleMenuSeparator::getAccessibleRole( ) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessiblepopupmenu.cxx b/accessibility/source/standard/vclxaccessiblepopupmenu.cxx index 6f0730d212d0..2fb569857bf2 100644 --- a/accessibility/source/standard/vclxaccessiblepopupmenu.cxx +++ b/accessibility/source/standard/vclxaccessiblepopupmenu.cxx @@ -51,13 +51,13 @@ bool VCLXAccessiblePopupMenu::IsFocused() // XServiceInfo -OUString VCLXAccessiblePopupMenu::getImplementationName() throw (RuntimeException, std::exception) +OUString VCLXAccessiblePopupMenu::getImplementationName() { return OUString( "com.sun.star.comp.toolkit.AccessiblePopupMenu" ); } -Sequence< OUString > VCLXAccessiblePopupMenu::getSupportedServiceNames() throw (RuntimeException, std::exception) +Sequence< OUString > VCLXAccessiblePopupMenu::getSupportedServiceNames() { return { "com.sun.star.awt.AccessiblePopupMenu" }; } @@ -66,7 +66,7 @@ Sequence< OUString > VCLXAccessiblePopupMenu::getSupportedServiceNames() throw ( // XAccessibleContext -sal_Int32 VCLXAccessiblePopupMenu::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessiblePopupMenu::getAccessibleIndexInParent( ) { OExternalLockGuard aGuard( this ); @@ -74,7 +74,7 @@ sal_Int32 VCLXAccessiblePopupMenu::getAccessibleIndexInParent( ) throw (Runtime } -sal_Int16 VCLXAccessiblePopupMenu::getAccessibleRole( ) throw (RuntimeException, std::exception) +sal_Int16 VCLXAccessiblePopupMenu::getAccessibleRole( ) { OExternalLockGuard aGuard( this ); @@ -85,7 +85,7 @@ sal_Int16 VCLXAccessiblePopupMenu::getAccessibleRole( ) throw (RuntimeException // XAccessibleExtendedComponent -sal_Int32 VCLXAccessiblePopupMenu::getBackground( ) throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessiblePopupMenu::getBackground( ) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessibleradiobutton.cxx b/accessibility/source/standard/vclxaccessibleradiobutton.cxx index ab567e27609f..e39f07de5716 100644 --- a/accessibility/source/standard/vclxaccessibleradiobutton.cxx +++ b/accessibility/source/standard/vclxaccessibleradiobutton.cxx @@ -134,13 +134,13 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleRadioButton, VCLXAccessibleTextC // XServiceInfo -OUString VCLXAccessibleRadioButton::getImplementationName() throw (RuntimeException, std::exception) +OUString VCLXAccessibleRadioButton::getImplementationName() { return OUString( "com.sun.star.comp.toolkit.AccessibleRadioButton" ); } -Sequence< OUString > VCLXAccessibleRadioButton::getSupportedServiceNames() throw (RuntimeException, std::exception) +Sequence< OUString > VCLXAccessibleRadioButton::getSupportedServiceNames() { return { "com.sun.star.awt.AccessibleRadioButton" }; } @@ -149,7 +149,7 @@ Sequence< OUString > VCLXAccessibleRadioButton::getSupportedServiceNames() throw // XAccessibleAction -sal_Int32 VCLXAccessibleRadioButton::getAccessibleActionCount( ) throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleRadioButton::getAccessibleActionCount( ) { OExternalLockGuard aGuard( this ); @@ -157,7 +157,7 @@ sal_Int32 VCLXAccessibleRadioButton::getAccessibleActionCount( ) throw (RuntimeE } -sal_Bool VCLXAccessibleRadioButton::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool VCLXAccessibleRadioButton::doAccessibleAction ( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); @@ -172,7 +172,7 @@ sal_Bool VCLXAccessibleRadioButton::doAccessibleAction ( sal_Int32 nIndex ) thro } -OUString VCLXAccessibleRadioButton::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +OUString VCLXAccessibleRadioButton::getAccessibleActionDescription ( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); @@ -183,7 +183,7 @@ OUString VCLXAccessibleRadioButton::getAccessibleActionDescription ( sal_Int32 n } -Reference< XAccessibleKeyBinding > VCLXAccessibleRadioButton::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XAccessibleKeyBinding > VCLXAccessibleRadioButton::getAccessibleActionKeyBinding( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); @@ -224,7 +224,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleRadioButton::getAccessibleActio // XAccessibleValue -Any VCLXAccessibleRadioButton::getCurrentValue( ) throw (RuntimeException, std::exception) +Any VCLXAccessibleRadioButton::getCurrentValue( ) { OExternalLockGuard aGuard( this ); @@ -238,7 +238,7 @@ Any VCLXAccessibleRadioButton::getCurrentValue( ) throw (RuntimeException, std: } -sal_Bool VCLXAccessibleRadioButton::setCurrentValue( const Any& aNumber ) throw (RuntimeException, std::exception) +sal_Bool VCLXAccessibleRadioButton::setCurrentValue( const Any& aNumber ) { OExternalLockGuard aGuard( this ); @@ -263,7 +263,7 @@ sal_Bool VCLXAccessibleRadioButton::setCurrentValue( const Any& aNumber ) throw } -Any VCLXAccessibleRadioButton::getMaximumValue( ) throw (RuntimeException, std::exception) +Any VCLXAccessibleRadioButton::getMaximumValue( ) { OExternalLockGuard aGuard( this ); @@ -274,7 +274,7 @@ Any VCLXAccessibleRadioButton::getMaximumValue( ) throw (RuntimeException, std: } -Any VCLXAccessibleRadioButton::getMinimumValue( ) throw (RuntimeException, std::exception) +Any VCLXAccessibleRadioButton::getMinimumValue( ) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessiblescrollbar.cxx b/accessibility/source/standard/vclxaccessiblescrollbar.cxx index 74e89b53d36e..6995adf18946 100644 --- a/accessibility/source/standard/vclxaccessiblescrollbar.cxx +++ b/accessibility/source/standard/vclxaccessiblescrollbar.cxx @@ -101,13 +101,13 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleScrollBar, VCLXAccessibleCompone // XServiceInfo -OUString VCLXAccessibleScrollBar::getImplementationName() throw (RuntimeException, std::exception) +OUString VCLXAccessibleScrollBar::getImplementationName() { return OUString( "com.sun.star.comp.toolkit.AccessibleScrollBar" ); } -Sequence< OUString > VCLXAccessibleScrollBar::getSupportedServiceNames() throw (RuntimeException, std::exception) +Sequence< OUString > VCLXAccessibleScrollBar::getSupportedServiceNames() { return { "com.sun.star.awt.AccessibleScrollBar" }; } @@ -116,7 +116,7 @@ Sequence< OUString > VCLXAccessibleScrollBar::getSupportedServiceNames() throw ( // XAccessibleAction -sal_Int32 VCLXAccessibleScrollBar::getAccessibleActionCount( ) throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleScrollBar::getAccessibleActionCount( ) { OExternalLockGuard aGuard( this ); @@ -124,7 +124,7 @@ sal_Int32 VCLXAccessibleScrollBar::getAccessibleActionCount( ) throw (RuntimeExc } -sal_Bool VCLXAccessibleScrollBar::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool VCLXAccessibleScrollBar::doAccessibleAction ( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); @@ -152,7 +152,7 @@ sal_Bool VCLXAccessibleScrollBar::doAccessibleAction ( sal_Int32 nIndex ) throw } -OUString VCLXAccessibleScrollBar::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +OUString VCLXAccessibleScrollBar::getAccessibleActionDescription ( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); @@ -174,7 +174,7 @@ OUString VCLXAccessibleScrollBar::getAccessibleActionDescription ( sal_Int32 nIn } -Reference< XAccessibleKeyBinding > VCLXAccessibleScrollBar::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XAccessibleKeyBinding > VCLXAccessibleScrollBar::getAccessibleActionKeyBinding( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); @@ -188,7 +188,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleScrollBar::getAccessibleActionK // XAccessibleValue -Any VCLXAccessibleScrollBar::getCurrentValue( ) throw (RuntimeException, std::exception) +Any VCLXAccessibleScrollBar::getCurrentValue( ) { OExternalLockGuard aGuard( this ); @@ -202,7 +202,7 @@ Any VCLXAccessibleScrollBar::getCurrentValue( ) throw (RuntimeException, std::e } -sal_Bool VCLXAccessibleScrollBar::setCurrentValue( const Any& aNumber ) throw (RuntimeException, std::exception) +sal_Bool VCLXAccessibleScrollBar::setCurrentValue( const Any& aNumber ) { OExternalLockGuard aGuard( this ); @@ -229,7 +229,7 @@ sal_Bool VCLXAccessibleScrollBar::setCurrentValue( const Any& aNumber ) throw (R } -Any VCLXAccessibleScrollBar::getMaximumValue( ) throw (RuntimeException, std::exception) +Any VCLXAccessibleScrollBar::getMaximumValue( ) { OExternalLockGuard aGuard( this ); @@ -243,7 +243,7 @@ Any VCLXAccessibleScrollBar::getMaximumValue( ) throw (RuntimeException, std::e } -Any VCLXAccessibleScrollBar::getMinimumValue( ) throw (RuntimeException, std::exception) +Any VCLXAccessibleScrollBar::getMinimumValue( ) { OExternalLockGuard aGuard( this ); @@ -254,7 +254,7 @@ Any VCLXAccessibleScrollBar::getMinimumValue( ) throw (RuntimeException, std::e } -OUString VCLXAccessibleScrollBar::getAccessibleName( ) throw (uno::RuntimeException, std::exception) +OUString VCLXAccessibleScrollBar::getAccessibleName( ) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessiblestatusbar.cxx b/accessibility/source/standard/vclxaccessiblestatusbar.cxx index 22b4e22713ee..86686997e63b 100644 --- a/accessibility/source/standard/vclxaccessiblestatusbar.cxx +++ b/accessibility/source/standard/vclxaccessiblestatusbar.cxx @@ -273,13 +273,13 @@ void VCLXAccessibleStatusBar::disposing() // XServiceInfo -OUString VCLXAccessibleStatusBar::getImplementationName() throw (RuntimeException, std::exception) +OUString VCLXAccessibleStatusBar::getImplementationName() { return OUString( "com.sun.star.comp.toolkit.AccessibleStatusBar" ); } -Sequence< OUString > VCLXAccessibleStatusBar::getSupportedServiceNames() throw (RuntimeException, std::exception) +Sequence< OUString > VCLXAccessibleStatusBar::getSupportedServiceNames() { return { "com.sun.star.awt.AccessibleStatusBar" }; } @@ -288,7 +288,7 @@ Sequence< OUString > VCLXAccessibleStatusBar::getSupportedServiceNames() throw ( // XAccessibleContext -sal_Int32 VCLXAccessibleStatusBar::getAccessibleChildCount() throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleStatusBar::getAccessibleChildCount() { OExternalLockGuard aGuard( this ); @@ -296,7 +296,7 @@ sal_Int32 VCLXAccessibleStatusBar::getAccessibleChildCount() throw (RuntimeExcep } -Reference< XAccessible > VCLXAccessibleStatusBar::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XAccessible > VCLXAccessibleStatusBar::getAccessibleChild( sal_Int32 i ) { OExternalLockGuard aGuard( this ); @@ -324,7 +324,7 @@ Reference< XAccessible > VCLXAccessibleStatusBar::getAccessibleChild( sal_Int32 // XAccessibleComponent -Reference< XAccessible > VCLXAccessibleStatusBar::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException, std::exception) +Reference< XAccessible > VCLXAccessibleStatusBar::getAccessibleAtPoint( const awt::Point& rPoint ) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx index 5ae808ffef67..8ef763456cea 100644 --- a/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx +++ b/accessibility/source/standard/vclxaccessiblestatusbaritem.cxx @@ -157,7 +157,7 @@ void VCLXAccessibleStatusBarItem::FillAccessibleStateSet( utl::AccessibleStateSe // OCommonAccessibleComponent -awt::Rectangle VCLXAccessibleStatusBarItem::implGetBounds() throw (RuntimeException) +awt::Rectangle VCLXAccessibleStatusBarItem::implGetBounds() { awt::Rectangle aBounds( 0, 0, 0, 0 ); @@ -218,19 +218,19 @@ void VCLXAccessibleStatusBarItem::disposing() // XServiceInfo -OUString VCLXAccessibleStatusBarItem::getImplementationName() throw (RuntimeException, std::exception) +OUString VCLXAccessibleStatusBarItem::getImplementationName() { return OUString( "com.sun.star.comp.toolkit.AccessibleStatusBarItem" ); } -sal_Bool VCLXAccessibleStatusBarItem::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) +sal_Bool VCLXAccessibleStatusBarItem::supportsService( const OUString& rServiceName ) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > VCLXAccessibleStatusBarItem::getSupportedServiceNames() throw (RuntimeException, std::exception) +Sequence< OUString > VCLXAccessibleStatusBarItem::getSupportedServiceNames() { return { "com.sun.star.awt.AccessibleStatusBarItem" }; } @@ -239,7 +239,7 @@ Sequence< OUString > VCLXAccessibleStatusBarItem::getSupportedServiceNames() thr // XAccessible -Reference< XAccessibleContext > VCLXAccessibleStatusBarItem::getAccessibleContext( ) throw (RuntimeException, std::exception) +Reference< XAccessibleContext > VCLXAccessibleStatusBarItem::getAccessibleContext( ) { OExternalLockGuard aGuard( this ); @@ -250,7 +250,7 @@ Reference< XAccessibleContext > VCLXAccessibleStatusBarItem::getAccessibleContex // XAccessibleContext -sal_Int32 VCLXAccessibleStatusBarItem::getAccessibleChildCount() throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleStatusBarItem::getAccessibleChildCount() { OExternalLockGuard aGuard( this ); @@ -258,7 +258,7 @@ sal_Int32 VCLXAccessibleStatusBarItem::getAccessibleChildCount() throw (RuntimeE } -Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleChild( sal_Int32 i ) { OExternalLockGuard aGuard( this ); @@ -269,7 +269,7 @@ Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleChild( sal_In } -Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleParent( ) throw (RuntimeException, std::exception) +Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleParent( ) { OExternalLockGuard aGuard( this ); @@ -281,7 +281,7 @@ Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleParent( ) th } -sal_Int32 VCLXAccessibleStatusBarItem::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleStatusBarItem::getAccessibleIndexInParent( ) { OExternalLockGuard aGuard( this ); @@ -293,7 +293,7 @@ sal_Int32 VCLXAccessibleStatusBarItem::getAccessibleIndexInParent( ) throw (Run } -sal_Int16 VCLXAccessibleStatusBarItem::getAccessibleRole( ) throw (RuntimeException, std::exception) +sal_Int16 VCLXAccessibleStatusBarItem::getAccessibleRole( ) { OExternalLockGuard aGuard( this ); @@ -301,7 +301,7 @@ sal_Int16 VCLXAccessibleStatusBarItem::getAccessibleRole( ) throw (RuntimeExcep } -OUString VCLXAccessibleStatusBarItem::getAccessibleDescription( ) throw (RuntimeException, std::exception) +OUString VCLXAccessibleStatusBarItem::getAccessibleDescription( ) { OExternalLockGuard aGuard( this ); @@ -313,7 +313,7 @@ OUString VCLXAccessibleStatusBarItem::getAccessibleDescription( ) throw (Runtim } -OUString VCLXAccessibleStatusBarItem::getAccessibleName( ) throw (RuntimeException, std::exception) +OUString VCLXAccessibleStatusBarItem::getAccessibleName( ) { OExternalLockGuard aGuard( this ); @@ -321,7 +321,7 @@ OUString VCLXAccessibleStatusBarItem::getAccessibleName( ) throw (RuntimeExcept } -Reference< XAccessibleRelationSet > VCLXAccessibleStatusBarItem::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) +Reference< XAccessibleRelationSet > VCLXAccessibleStatusBarItem::getAccessibleRelationSet( ) { OExternalLockGuard aGuard( this ); @@ -331,7 +331,7 @@ Reference< XAccessibleRelationSet > VCLXAccessibleStatusBarItem::getAccessibleRe } -Reference< XAccessibleStateSet > VCLXAccessibleStatusBarItem::getAccessibleStateSet( ) throw (RuntimeException, std::exception) +Reference< XAccessibleStateSet > VCLXAccessibleStatusBarItem::getAccessibleStateSet( ) { OExternalLockGuard aGuard( this ); @@ -351,7 +351,7 @@ Reference< XAccessibleStateSet > VCLXAccessibleStatusBarItem::getAccessibleState } -Locale VCLXAccessibleStatusBarItem::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) +Locale VCLXAccessibleStatusBarItem::getLocale( ) { OExternalLockGuard aGuard( this ); @@ -362,7 +362,7 @@ Locale VCLXAccessibleStatusBarItem::getLocale( ) throw (IllegalAccessibleCompon // XAccessibleComponent -Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException, std::exception) +Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleAtPoint( const awt::Point& ) { OExternalLockGuard aGuard( this ); @@ -370,13 +370,13 @@ Reference< XAccessible > VCLXAccessibleStatusBarItem::getAccessibleAtPoint( cons } -void VCLXAccessibleStatusBarItem::grabFocus( ) throw (RuntimeException, std::exception) +void VCLXAccessibleStatusBarItem::grabFocus( ) { // no focus for status bar items } -sal_Int32 VCLXAccessibleStatusBarItem::getForeground( ) throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleStatusBarItem::getForeground( ) { OExternalLockGuard aGuard( this ); @@ -393,7 +393,7 @@ sal_Int32 VCLXAccessibleStatusBarItem::getForeground( ) throw (RuntimeExceptio } -sal_Int32 VCLXAccessibleStatusBarItem::getBackground( ) throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleStatusBarItem::getBackground( ) { OExternalLockGuard aGuard( this ); @@ -413,7 +413,7 @@ sal_Int32 VCLXAccessibleStatusBarItem::getBackground( ) throw (RuntimeException // XAccessibleExtendedComponent -Reference< awt::XFont > VCLXAccessibleStatusBarItem::getFont( ) throw (RuntimeException, std::exception) +Reference< awt::XFont > VCLXAccessibleStatusBarItem::getFont( ) { OExternalLockGuard aGuard( this ); @@ -430,7 +430,7 @@ Reference< awt::XFont > VCLXAccessibleStatusBarItem::getFont( ) throw (RuntimeE } -OUString VCLXAccessibleStatusBarItem::getTitledBorderText( ) throw (RuntimeException, std::exception) +OUString VCLXAccessibleStatusBarItem::getTitledBorderText( ) { OExternalLockGuard aGuard( this ); @@ -438,7 +438,7 @@ OUString VCLXAccessibleStatusBarItem::getTitledBorderText( ) throw (RuntimeExce } -OUString VCLXAccessibleStatusBarItem::getToolTipText( ) throw (RuntimeException, std::exception) +OUString VCLXAccessibleStatusBarItem::getToolTipText( ) { OExternalLockGuard aGuard( this ); @@ -449,7 +449,7 @@ OUString VCLXAccessibleStatusBarItem::getToolTipText( ) throw (RuntimeException // XAccessibleText -sal_Int32 VCLXAccessibleStatusBarItem::getCaretPosition() throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleStatusBarItem::getCaretPosition() { OExternalLockGuard aGuard( this ); @@ -457,7 +457,7 @@ sal_Int32 VCLXAccessibleStatusBarItem::getCaretPosition() throw (RuntimeExceptio } -sal_Bool VCLXAccessibleStatusBarItem::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool VCLXAccessibleStatusBarItem::setCaretPosition( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); @@ -468,7 +468,7 @@ sal_Bool VCLXAccessibleStatusBarItem::setCaretPosition( sal_Int32 nIndex ) throw } -Sequence< PropertyValue > VCLXAccessibleStatusBarItem::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Sequence< PropertyValue > VCLXAccessibleStatusBarItem::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes ) { OExternalLockGuard aGuard( this ); @@ -491,7 +491,7 @@ Sequence< PropertyValue > VCLXAccessibleStatusBarItem::getCharacterAttributes( s } -awt::Rectangle VCLXAccessibleStatusBarItem::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +awt::Rectangle VCLXAccessibleStatusBarItem::getCharacterBounds( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); @@ -513,7 +513,7 @@ awt::Rectangle VCLXAccessibleStatusBarItem::getCharacterBounds( sal_Int32 nIndex } -sal_Int32 VCLXAccessibleStatusBarItem::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleStatusBarItem::getIndexAtPoint( const awt::Point& aPoint ) { OExternalLockGuard aGuard( this ); @@ -532,7 +532,7 @@ sal_Int32 VCLXAccessibleStatusBarItem::getIndexAtPoint( const awt::Point& aPoint } -sal_Bool VCLXAccessibleStatusBarItem::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool VCLXAccessibleStatusBarItem::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { OExternalLockGuard aGuard( this ); @@ -543,7 +543,7 @@ sal_Bool VCLXAccessibleStatusBarItem::setSelection( sal_Int32 nStartIndex, sal_I } -sal_Bool VCLXAccessibleStatusBarItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool VCLXAccessibleStatusBarItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessibletabcontrol.cxx b/accessibility/source/standard/vclxaccessibletabcontrol.cxx index 17762a1a1472..e1426e9f08b3 100644 --- a/accessibility/source/standard/vclxaccessibletabcontrol.cxx +++ b/accessibility/source/standard/vclxaccessibletabcontrol.cxx @@ -332,13 +332,13 @@ void VCLXAccessibleTabControl::disposing() // XServiceInfo -OUString VCLXAccessibleTabControl::getImplementationName() throw (RuntimeException, std::exception) +OUString VCLXAccessibleTabControl::getImplementationName() { return OUString( "com.sun.star.comp.toolkit.AccessibleTabControl" ); } -Sequence< OUString > VCLXAccessibleTabControl::getSupportedServiceNames() throw (RuntimeException, std::exception) +Sequence< OUString > VCLXAccessibleTabControl::getSupportedServiceNames() { return { "com.sun.star.awt.AccessibleTabControl" }; } @@ -347,7 +347,7 @@ Sequence< OUString > VCLXAccessibleTabControl::getSupportedServiceNames() throw // XAccessibleContext -sal_Int32 VCLXAccessibleTabControl::getAccessibleChildCount() throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleTabControl::getAccessibleChildCount() { OExternalLockGuard aGuard( this ); @@ -355,7 +355,7 @@ sal_Int32 VCLXAccessibleTabControl::getAccessibleChildCount() throw (RuntimeExce } -Reference< XAccessible > VCLXAccessibleTabControl::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XAccessible > VCLXAccessibleTabControl::getAccessibleChild( sal_Int32 i ) { OExternalLockGuard aGuard( this ); @@ -379,7 +379,7 @@ Reference< XAccessible > VCLXAccessibleTabControl::getAccessibleChild( sal_Int32 } -sal_Int16 VCLXAccessibleTabControl::getAccessibleRole( ) throw (RuntimeException, std::exception) +sal_Int16 VCLXAccessibleTabControl::getAccessibleRole( ) { OExternalLockGuard aGuard( this ); @@ -387,7 +387,7 @@ sal_Int16 VCLXAccessibleTabControl::getAccessibleRole( ) throw (RuntimeExceptio } -OUString VCLXAccessibleTabControl::getAccessibleName( ) throw (RuntimeException, std::exception) +OUString VCLXAccessibleTabControl::getAccessibleName( ) { OExternalLockGuard aGuard( this ); @@ -398,7 +398,7 @@ OUString VCLXAccessibleTabControl::getAccessibleName( ) throw (RuntimeException // XAccessibleSelection -void VCLXAccessibleTabControl::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +void VCLXAccessibleTabControl::selectAccessibleChild( sal_Int32 nChildIndex ) { OExternalLockGuard aGuard( this ); @@ -410,7 +410,7 @@ void VCLXAccessibleTabControl::selectAccessibleChild( sal_Int32 nChildIndex ) th } -sal_Bool VCLXAccessibleTabControl::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool VCLXAccessibleTabControl::isAccessibleChildSelected( sal_Int32 nChildIndex ) { OExternalLockGuard aGuard( this ); @@ -425,13 +425,13 @@ sal_Bool VCLXAccessibleTabControl::isAccessibleChildSelected( sal_Int32 nChildIn } -void VCLXAccessibleTabControl::clearAccessibleSelection( ) throw (RuntimeException, std::exception) +void VCLXAccessibleTabControl::clearAccessibleSelection( ) { // This method makes no sense in a tab control, and so does nothing. } -void VCLXAccessibleTabControl::selectAllAccessibleChildren( ) throw (RuntimeException, std::exception) +void VCLXAccessibleTabControl::selectAllAccessibleChildren( ) { OExternalLockGuard aGuard( this ); @@ -439,7 +439,7 @@ void VCLXAccessibleTabControl::selectAllAccessibleChildren( ) throw (RuntimeExc } -sal_Int32 VCLXAccessibleTabControl::getSelectedAccessibleChildCount( ) throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleTabControl::getSelectedAccessibleChildCount( ) { OExternalLockGuard aGuard( this ); @@ -447,7 +447,7 @@ sal_Int32 VCLXAccessibleTabControl::getSelectedAccessibleChildCount( ) throw (R } -Reference< XAccessible > VCLXAccessibleTabControl::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XAccessible > VCLXAccessibleTabControl::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) { OExternalLockGuard aGuard( this ); @@ -469,7 +469,7 @@ Reference< XAccessible > VCLXAccessibleTabControl::getSelectedAccessibleChild( s } -void VCLXAccessibleTabControl::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +void VCLXAccessibleTabControl::deselectAccessibleChild( sal_Int32 nChildIndex ) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessibletabpage.cxx b/accessibility/source/standard/vclxaccessibletabpage.cxx index 86259281e49e..9f6999ea5131 100644 --- a/accessibility/source/standard/vclxaccessibletabpage.cxx +++ b/accessibility/source/standard/vclxaccessibletabpage.cxx @@ -189,7 +189,7 @@ void VCLXAccessibleTabPage::FillAccessibleStateSet( utl::AccessibleStateSetHelpe // OCommonAccessibleComponent -awt::Rectangle VCLXAccessibleTabPage::implGetBounds() throw (RuntimeException) +awt::Rectangle VCLXAccessibleTabPage::implGetBounds() { awt::Rectangle aBounds( 0, 0, 0, 0 ); @@ -249,19 +249,19 @@ void VCLXAccessibleTabPage::disposing() // XServiceInfo -OUString VCLXAccessibleTabPage::getImplementationName() throw (RuntimeException, std::exception) +OUString VCLXAccessibleTabPage::getImplementationName() { return OUString( "com.sun.star.comp.toolkit.AccessibleTabPage" ); } -sal_Bool VCLXAccessibleTabPage::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) +sal_Bool VCLXAccessibleTabPage::supportsService( const OUString& rServiceName ) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > VCLXAccessibleTabPage::getSupportedServiceNames() throw (RuntimeException, std::exception) +Sequence< OUString > VCLXAccessibleTabPage::getSupportedServiceNames() { return { "com.sun.star.awt.AccessibleTabPage" }; } @@ -270,7 +270,7 @@ Sequence< OUString > VCLXAccessibleTabPage::getSupportedServiceNames() throw (Ru // XAccessible -Reference< XAccessibleContext > VCLXAccessibleTabPage::getAccessibleContext( ) throw (RuntimeException, std::exception) +Reference< XAccessibleContext > VCLXAccessibleTabPage::getAccessibleContext( ) { OExternalLockGuard aGuard( this ); @@ -281,7 +281,7 @@ Reference< XAccessibleContext > VCLXAccessibleTabPage::getAccessibleContext( ) // XAccessibleContext -sal_Int32 VCLXAccessibleTabPage::getAccessibleChildCount() throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleTabPage::getAccessibleChildCount() { OExternalLockGuard aGuard( this ); @@ -297,7 +297,7 @@ sal_Int32 VCLXAccessibleTabPage::getAccessibleChildCount() throw (RuntimeExcepti } -Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleChild( sal_Int32 i ) { OExternalLockGuard aGuard( this ); @@ -316,7 +316,7 @@ Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleChild( sal_Int32 i } -Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleParent( ) throw (RuntimeException, std::exception) +Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleParent( ) { OExternalLockGuard aGuard( this ); @@ -328,7 +328,7 @@ Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleParent( ) throw (R } -sal_Int32 VCLXAccessibleTabPage::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleTabPage::getAccessibleIndexInParent( ) { OExternalLockGuard aGuard( this ); @@ -340,7 +340,7 @@ sal_Int32 VCLXAccessibleTabPage::getAccessibleIndexInParent( ) throw (RuntimeEx } -sal_Int16 VCLXAccessibleTabPage::getAccessibleRole( ) throw (RuntimeException, std::exception) +sal_Int16 VCLXAccessibleTabPage::getAccessibleRole( ) { OExternalLockGuard aGuard( this ); @@ -348,7 +348,7 @@ sal_Int16 VCLXAccessibleTabPage::getAccessibleRole( ) throw (RuntimeException, } -OUString VCLXAccessibleTabPage::getAccessibleDescription( ) throw (RuntimeException, std::exception) +OUString VCLXAccessibleTabPage::getAccessibleDescription( ) { OExternalLockGuard aGuard( this ); @@ -360,7 +360,7 @@ OUString VCLXAccessibleTabPage::getAccessibleDescription( ) throw (RuntimeExc } -OUString VCLXAccessibleTabPage::getAccessibleName( ) throw (RuntimeException, std::exception) +OUString VCLXAccessibleTabPage::getAccessibleName( ) { OExternalLockGuard aGuard( this ); @@ -368,7 +368,7 @@ OUString VCLXAccessibleTabPage::getAccessibleName( ) throw (RuntimeException, s } -Reference< XAccessibleRelationSet > VCLXAccessibleTabPage::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) +Reference< XAccessibleRelationSet > VCLXAccessibleTabPage::getAccessibleRelationSet( ) { OExternalLockGuard aGuard( this ); @@ -378,7 +378,7 @@ Reference< XAccessibleRelationSet > VCLXAccessibleTabPage::getAccessibleRelation } -Reference< XAccessibleStateSet > VCLXAccessibleTabPage::getAccessibleStateSet( ) throw (RuntimeException, std::exception) +Reference< XAccessibleStateSet > VCLXAccessibleTabPage::getAccessibleStateSet( ) { OExternalLockGuard aGuard( this ); @@ -398,7 +398,7 @@ Reference< XAccessibleStateSet > VCLXAccessibleTabPage::getAccessibleStateSet( } -Locale VCLXAccessibleTabPage::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) +Locale VCLXAccessibleTabPage::getLocale( ) { OExternalLockGuard aGuard( this ); @@ -409,7 +409,7 @@ Locale VCLXAccessibleTabPage::getLocale( ) throw (IllegalAccessibleComponentSta // XAccessibleComponent -Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException, std::exception) +Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleAtPoint( const awt::Point& rPoint ) { OExternalLockGuard aGuard( this ); @@ -437,7 +437,7 @@ Reference< XAccessible > VCLXAccessibleTabPage::getAccessibleAtPoint( const awt: } -void VCLXAccessibleTabPage::grabFocus( ) throw (RuntimeException, std::exception) +void VCLXAccessibleTabPage::grabFocus( ) { OExternalLockGuard aGuard( this ); @@ -449,7 +449,7 @@ void VCLXAccessibleTabPage::grabFocus( ) throw (RuntimeException, std::exceptio } -sal_Int32 VCLXAccessibleTabPage::getForeground( ) throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleTabPage::getForeground( ) { OExternalLockGuard aGuard( this ); @@ -466,7 +466,7 @@ sal_Int32 VCLXAccessibleTabPage::getForeground( ) throw (RuntimeException, std:: } -sal_Int32 VCLXAccessibleTabPage::getBackground( ) throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleTabPage::getBackground( ) { OExternalLockGuard aGuard( this ); @@ -486,7 +486,7 @@ sal_Int32 VCLXAccessibleTabPage::getBackground( ) throw (RuntimeException, std: // XAccessibleExtendedComponent -Reference< awt::XFont > VCLXAccessibleTabPage::getFont( ) throw (RuntimeException, std::exception) +Reference< awt::XFont > VCLXAccessibleTabPage::getFont( ) { OExternalLockGuard aGuard( this ); @@ -503,7 +503,7 @@ Reference< awt::XFont > VCLXAccessibleTabPage::getFont( ) throw (RuntimeExcepti } -OUString VCLXAccessibleTabPage::getTitledBorderText( ) throw (RuntimeException, std::exception) +OUString VCLXAccessibleTabPage::getTitledBorderText( ) { OExternalLockGuard aGuard( this ); @@ -511,7 +511,7 @@ OUString VCLXAccessibleTabPage::getTitledBorderText( ) throw (RuntimeException, } -OUString VCLXAccessibleTabPage::getToolTipText( ) throw (RuntimeException, std::exception) +OUString VCLXAccessibleTabPage::getToolTipText( ) { OExternalLockGuard aGuard( this ); @@ -522,7 +522,7 @@ OUString VCLXAccessibleTabPage::getToolTipText( ) throw (RuntimeException, std: // XAccessibleText -sal_Int32 VCLXAccessibleTabPage::getCaretPosition() throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleTabPage::getCaretPosition() { OExternalLockGuard aGuard( this ); @@ -530,7 +530,7 @@ sal_Int32 VCLXAccessibleTabPage::getCaretPosition() throw (RuntimeException, std } -sal_Bool VCLXAccessibleTabPage::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool VCLXAccessibleTabPage::setCaretPosition( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); @@ -541,7 +541,7 @@ sal_Bool VCLXAccessibleTabPage::setCaretPosition( sal_Int32 nIndex ) throw (Inde } -Sequence< PropertyValue > VCLXAccessibleTabPage::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Sequence< PropertyValue > VCLXAccessibleTabPage::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes ) { OExternalLockGuard aGuard( this ); @@ -564,7 +564,7 @@ Sequence< PropertyValue > VCLXAccessibleTabPage::getCharacterAttributes( sal_Int } -awt::Rectangle VCLXAccessibleTabPage::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +awt::Rectangle VCLXAccessibleTabPage::getCharacterBounds( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); @@ -584,7 +584,7 @@ awt::Rectangle VCLXAccessibleTabPage::getCharacterBounds( sal_Int32 nIndex ) thr } -sal_Int32 VCLXAccessibleTabPage::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleTabPage::getIndexAtPoint( const awt::Point& aPoint ) { OExternalLockGuard aGuard( this ); @@ -604,7 +604,7 @@ sal_Int32 VCLXAccessibleTabPage::getIndexAtPoint( const awt::Point& aPoint ) thr } -sal_Bool VCLXAccessibleTabPage::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool VCLXAccessibleTabPage::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { OExternalLockGuard aGuard( this ); @@ -615,7 +615,7 @@ sal_Bool VCLXAccessibleTabPage::setSelection( sal_Int32 nStartIndex, sal_Int32 n } -sal_Bool VCLXAccessibleTabPage::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool VCLXAccessibleTabPage::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx index 94283017d80e..ec89a48d5c3a 100644 --- a/accessibility/source/standard/vclxaccessibletabpagewindow.cxx +++ b/accessibility/source/standard/vclxaccessibletabpagewindow.cxx @@ -66,7 +66,7 @@ VCLXAccessibleTabPageWindow::~VCLXAccessibleTabPageWindow() // OCommonAccessibleComponent -awt::Rectangle VCLXAccessibleTabPageWindow::implGetBounds() throw (RuntimeException) +awt::Rectangle VCLXAccessibleTabPageWindow::implGetBounds() { awt::Rectangle aBounds( 0, 0, 0, 0 ); @@ -100,7 +100,7 @@ void VCLXAccessibleTabPageWindow::disposing() // XAccessibleContext -Reference< XAccessible > VCLXAccessibleTabPageWindow::getAccessibleParent( ) throw (RuntimeException, std::exception) +Reference< XAccessible > VCLXAccessibleTabPageWindow::getAccessibleParent( ) { OExternalLockGuard aGuard( this ); @@ -128,7 +128,7 @@ Reference< XAccessible > VCLXAccessibleTabPageWindow::getAccessibleParent( ) th } -sal_Int32 VCLXAccessibleTabPageWindow::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleTabPageWindow::getAccessibleIndexInParent( ) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessibletextcomponent.cxx b/accessibility/source/standard/vclxaccessibletextcomponent.cxx index 3fa741fa4a13..615f70f6d363 100644 --- a/accessibility/source/standard/vclxaccessibletextcomponent.cxx +++ b/accessibility/source/standard/vclxaccessibletextcomponent.cxx @@ -138,7 +138,7 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXAccessibleTextComponent, VCLXAccessibleCom // XAccessibleText -sal_Int32 VCLXAccessibleTextComponent::getCaretPosition() throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleTextComponent::getCaretPosition() { OExternalLockGuard aGuard( this ); @@ -146,7 +146,7 @@ sal_Int32 VCLXAccessibleTextComponent::getCaretPosition() throw (RuntimeExceptio } -sal_Bool VCLXAccessibleTextComponent::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool VCLXAccessibleTextComponent::setCaretPosition( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); @@ -154,7 +154,7 @@ sal_Bool VCLXAccessibleTextComponent::setCaretPosition( sal_Int32 nIndex ) throw } -sal_Unicode VCLXAccessibleTextComponent::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Unicode VCLXAccessibleTextComponent::getCharacter( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); @@ -162,7 +162,7 @@ sal_Unicode VCLXAccessibleTextComponent::getCharacter( sal_Int32 nIndex ) throw } -Sequence< PropertyValue > VCLXAccessibleTextComponent::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Sequence< PropertyValue > VCLXAccessibleTextComponent::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& aRequestedAttributes ) { OExternalLockGuard aGuard( this ); @@ -236,7 +236,7 @@ Sequence< PropertyValue > VCLXAccessibleTextComponent::getCharacterAttributes( s } -awt::Rectangle VCLXAccessibleTextComponent::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +awt::Rectangle VCLXAccessibleTextComponent::getCharacterBounds( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); @@ -252,7 +252,7 @@ awt::Rectangle VCLXAccessibleTextComponent::getCharacterBounds( sal_Int32 nIndex } -sal_Int32 VCLXAccessibleTextComponent::getCharacterCount() throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleTextComponent::getCharacterCount() { OExternalLockGuard aGuard( this ); @@ -260,7 +260,7 @@ sal_Int32 VCLXAccessibleTextComponent::getCharacterCount() throw (RuntimeExcepti } -sal_Int32 VCLXAccessibleTextComponent::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleTextComponent::getIndexAtPoint( const awt::Point& aPoint ) { OExternalLockGuard aGuard( this ); @@ -273,7 +273,7 @@ sal_Int32 VCLXAccessibleTextComponent::getIndexAtPoint( const awt::Point& aPoint } -OUString VCLXAccessibleTextComponent::getSelectedText() throw (RuntimeException, std::exception) +OUString VCLXAccessibleTextComponent::getSelectedText() { OExternalLockGuard aGuard( this ); @@ -281,7 +281,7 @@ OUString VCLXAccessibleTextComponent::getSelectedText() throw (RuntimeException, } -sal_Int32 VCLXAccessibleTextComponent::getSelectionStart() throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleTextComponent::getSelectionStart() { OExternalLockGuard aGuard( this ); @@ -289,7 +289,7 @@ sal_Int32 VCLXAccessibleTextComponent::getSelectionStart() throw (RuntimeExcepti } -sal_Int32 VCLXAccessibleTextComponent::getSelectionEnd() throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleTextComponent::getSelectionEnd() { OExternalLockGuard aGuard( this ); @@ -297,7 +297,7 @@ sal_Int32 VCLXAccessibleTextComponent::getSelectionEnd() throw (RuntimeException } -sal_Bool VCLXAccessibleTextComponent::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool VCLXAccessibleTextComponent::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { OExternalLockGuard aGuard( this ); @@ -308,7 +308,7 @@ sal_Bool VCLXAccessibleTextComponent::setSelection( sal_Int32 nStartIndex, sal_I } -OUString VCLXAccessibleTextComponent::getText() throw (RuntimeException, std::exception) +OUString VCLXAccessibleTextComponent::getText() { OExternalLockGuard aGuard( this ); @@ -316,7 +316,7 @@ OUString VCLXAccessibleTextComponent::getText() throw (RuntimeException, std::ex } -OUString VCLXAccessibleTextComponent::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +OUString VCLXAccessibleTextComponent::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { OExternalLockGuard aGuard( this ); @@ -324,7 +324,7 @@ OUString VCLXAccessibleTextComponent::getTextRange( sal_Int32 nStartIndex, sal_I } -css::accessibility::TextSegment VCLXAccessibleTextComponent::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) +css::accessibility::TextSegment VCLXAccessibleTextComponent::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { OExternalLockGuard aGuard( this ); @@ -332,7 +332,7 @@ css::accessibility::TextSegment VCLXAccessibleTextComponent::getTextAtIndex( sal } -css::accessibility::TextSegment VCLXAccessibleTextComponent::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) +css::accessibility::TextSegment VCLXAccessibleTextComponent::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { OExternalLockGuard aGuard( this ); @@ -340,7 +340,7 @@ css::accessibility::TextSegment VCLXAccessibleTextComponent::getTextBeforeIndex( } -css::accessibility::TextSegment VCLXAccessibleTextComponent::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (css::lang::IndexOutOfBoundsException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) +css::accessibility::TextSegment VCLXAccessibleTextComponent::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { OExternalLockGuard aGuard( this ); @@ -348,7 +348,7 @@ css::accessibility::TextSegment VCLXAccessibleTextComponent::getTextBehindIndex( } -sal_Bool VCLXAccessibleTextComponent::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool VCLXAccessibleTextComponent::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { OExternalLockGuard aGuard( this ); diff --git a/accessibility/source/standard/vclxaccessibletextfield.cxx b/accessibility/source/standard/vclxaccessibletextfield.cxx index 0b34a576dc77..f3a460c36bbd 100644 --- a/accessibility/source/standard/vclxaccessibletextfield.cxx +++ b/accessibility/source/standard/vclxaccessibletextfield.cxx @@ -67,7 +67,6 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2(VCLXAccessibleTextField, VCLXAccessibleTextComp Reference SAL_CALL VCLXAccessibleTextField::getAccessibleContext() - throw (RuntimeException, std::exception) { return this; } @@ -76,21 +75,18 @@ Reference SAL_CALL // XAccessibleContext sal_Int32 SAL_CALL VCLXAccessibleTextField::getAccessibleChildCount() - throw (RuntimeException, std::exception) { return 0; } Reference SAL_CALL VCLXAccessibleTextField::getAccessibleChild (sal_Int32) - throw (IndexOutOfBoundsException, RuntimeException, std::exception) { throw IndexOutOfBoundsException(); } sal_Int16 SAL_CALL VCLXAccessibleTextField::getAccessibleRole() - throw (RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -98,7 +94,6 @@ sal_Int16 SAL_CALL VCLXAccessibleTextField::getAccessibleRole() } Reference< XAccessible > SAL_CALL VCLXAccessibleTextField::getAccessibleParent( ) - throw (RuntimeException, std::exception) { ::osl::Guard< ::osl::Mutex > aGuard( GetMutex() ); @@ -109,14 +104,12 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleTextField::getAccessibleParent( // XServiceInfo OUString VCLXAccessibleTextField::getImplementationName() - throw (RuntimeException, std::exception) { return OUString( "com.sun.star.comp.toolkit.AccessibleTextField" ); } Sequence< OUString > VCLXAccessibleTextField::getSupportedServiceNames() - throw (RuntimeException, std::exception) { Sequence< OUString > aNames = VCLXAccessibleTextComponent::getSupportedServiceNames(); sal_Int32 nLength = aNames.getLength(); diff --git a/accessibility/source/standard/vclxaccessibletoolbox.cxx b/accessibility/source/standard/vclxaccessibletoolbox.cxx index ab3ff8185dff..2280b4185d02 100644 --- a/accessibility/source/standard/vclxaccessibletoolbox.cxx +++ b/accessibility/source/standard/vclxaccessibletoolbox.cxx @@ -60,11 +60,11 @@ namespace ,m_nIndexInParent(_nIndexInParent) { } - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) override; }; - sal_Int32 SAL_CALL OToolBoxWindowItemContext::getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL OToolBoxWindowItemContext::getAccessibleIndexInParent( ) { ::osl::MutexGuard aGuard( m_aMutex ); return m_nIndexInParent; @@ -115,7 +115,7 @@ namespace ) override; // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const Sequence< sal_Int8 >& aIdentifier ) throw (RuntimeException, std::exception) override; + virtual sal_Int64 SAL_CALL getSomething( const Sequence< sal_Int8 >& aIdentifier ) override; static Sequence< sal_Int8 > getUnoTunnelImplementationId(); }; @@ -157,7 +157,7 @@ namespace return pId->getImplementationId(); } - sal_Int64 SAL_CALL OToolBoxWindowItem::getSomething( const Sequence< sal_Int8 >& _rId ) throw (RuntimeException, std::exception) + sal_Int64 SAL_CALL OToolBoxWindowItem::getSomething( const Sequence< sal_Int8 >& _rId ) { if ( ( 16 == _rId.getLength() ) && ( 0 == memcmp( getUnoTunnelImplementationId().getConstArray(), _rId.getConstArray(), 16 ) ) @@ -666,12 +666,12 @@ void SAL_CALL VCLXAccessibleToolBox::disposing() } // XServiceInfo -OUString VCLXAccessibleToolBox::getImplementationName() throw (RuntimeException, std::exception) +OUString VCLXAccessibleToolBox::getImplementationName() { return OUString( "com.sun.star.comp.toolkit.AccessibleToolBox" ); } -Sequence< OUString > VCLXAccessibleToolBox::getSupportedServiceNames() throw (RuntimeException, std::exception) +Sequence< OUString > VCLXAccessibleToolBox::getSupportedServiceNames() { Sequence< OUString > aNames = VCLXAccessibleComponent::getSupportedServiceNames(); sal_Int32 nLength = aNames.getLength(); @@ -681,7 +681,7 @@ Sequence< OUString > VCLXAccessibleToolBox::getSupportedServiceNames() throw (Ru } // XAccessibleContext -sal_Int32 SAL_CALL VCLXAccessibleToolBox::getAccessibleChildCount( ) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL VCLXAccessibleToolBox::getAccessibleChildCount( ) { comphelper::OExternalLockGuard aGuard( this ); @@ -693,7 +693,7 @@ sal_Int32 SAL_CALL VCLXAccessibleToolBox::getAccessibleChildCount( ) throw (Run return nCount; } -Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleChild( sal_Int32 i ) { if ( i < 0 || i >= getAccessibleChildCount() ) throw IndexOutOfBoundsException(); @@ -740,7 +740,7 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleChild( sal return nullptr; } -Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleAtPoint( const awt::Point& _rPoint ) throw (RuntimeException, std::exception) +Reference< XAccessible > SAL_CALL VCLXAccessibleToolBox::getAccessibleAtPoint( const awt::Point& _rPoint ) { comphelper::OExternalLockGuard aGuard( this ); @@ -785,7 +785,7 @@ Reference< XAccessible > VCLXAccessibleToolBox::GetChildAccessible( const VclWin } // XAccessibleSelection -void VCLXAccessibleToolBox::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +void VCLXAccessibleToolBox::selectAccessibleChild( sal_Int32 nChildIndex ) { OExternalLockGuard aGuard( this ); if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount() ) @@ -795,7 +795,7 @@ void VCLXAccessibleToolBox::selectAccessibleChild( sal_Int32 nChildIndex ) throw pToolBox->ChangeHighlight( nPos ); } -sal_Bool VCLXAccessibleToolBox::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool VCLXAccessibleToolBox::isAccessibleChildSelected( sal_Int32 nChildIndex ) { OExternalLockGuard aGuard( this ); if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount() ) @@ -808,20 +808,20 @@ sal_Bool VCLXAccessibleToolBox::isAccessibleChildSelected( sal_Int32 nChildIndex return false; } -void VCLXAccessibleToolBox::clearAccessibleSelection( ) throw (RuntimeException, std::exception) +void VCLXAccessibleToolBox::clearAccessibleSelection( ) { OExternalLockGuard aGuard( this ); VclPtr< ToolBox > pToolBox = GetAs< ToolBox >(); pToolBox -> LoseFocus(); } -void VCLXAccessibleToolBox::selectAllAccessibleChildren( ) throw (RuntimeException, std::exception) +void VCLXAccessibleToolBox::selectAllAccessibleChildren( ) { OExternalLockGuard aGuard( this ); // intentionally empty. makes no sense for a toolbox } -sal_Int32 VCLXAccessibleToolBox::getSelectedAccessibleChildCount( ) throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleToolBox::getSelectedAccessibleChildCount( ) { OExternalLockGuard aGuard( this ); sal_Int32 nRet = 0; @@ -836,7 +836,7 @@ sal_Int32 VCLXAccessibleToolBox::getSelectedAccessibleChildCount( ) throw (Runt return nRet; } -Reference< XAccessible > VCLXAccessibleToolBox::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XAccessible > VCLXAccessibleToolBox::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) { OExternalLockGuard aGuard( this ); if ( nSelectedChildIndex < 0 || nSelectedChildIndex >= getSelectedAccessibleChildCount() ) @@ -853,7 +853,7 @@ Reference< XAccessible > VCLXAccessibleToolBox::getSelectedAccessibleChild( sal_ return xChild; } -void VCLXAccessibleToolBox::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +void VCLXAccessibleToolBox::deselectAccessibleChild( sal_Int32 nChildIndex ) { OExternalLockGuard aGuard( this ); if ( nChildIndex < 0 || nChildIndex >= getAccessibleChildCount() ) diff --git a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx index 9d189001e403..645c7cbe6663 100644 --- a/accessibility/source/standard/vclxaccessibletoolboxitem.cxx +++ b/accessibility/source/standard/vclxaccessibletoolboxitem.cxx @@ -238,7 +238,7 @@ void VCLXAccessibleToolBoxItem::ToggleEnableState() NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue[1], aNewValue[1] ); } -awt::Rectangle VCLXAccessibleToolBoxItem::implGetBounds( ) throw (RuntimeException) +awt::Rectangle VCLXAccessibleToolBoxItem::implGetBounds( ) { awt::Rectangle aRect; if ( m_pToolBox ) @@ -266,7 +266,7 @@ void VCLXAccessibleToolBoxItem::implGetSelection( sal_Int32& nStartIndex, sal_In // XInterface IMPLEMENT_FORWARD_REFCOUNT( VCLXAccessibleToolBoxItem, AccessibleTextHelper_BASE ) -Any SAL_CALL VCLXAccessibleToolBoxItem::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception) +Any SAL_CALL VCLXAccessibleToolBoxItem::queryInterface( const Type& _rType ) { // #i33611# - toolbox buttons without text don't support XAccessibleText if ( _rType == cppu::UnoType::get() @@ -293,17 +293,17 @@ void SAL_CALL VCLXAccessibleToolBoxItem::disposing() // XServiceInfo -OUString VCLXAccessibleToolBoxItem::getImplementationName() throw (RuntimeException, std::exception) +OUString VCLXAccessibleToolBoxItem::getImplementationName() { return OUString( "com.sun.star.comp.toolkit.AccessibleToolBoxItem" ); } -sal_Bool VCLXAccessibleToolBoxItem::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) +sal_Bool VCLXAccessibleToolBoxItem::supportsService( const OUString& rServiceName ) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > VCLXAccessibleToolBoxItem::getSupportedServiceNames() throw (RuntimeException, std::exception) +Sequence< OUString > VCLXAccessibleToolBoxItem::getSupportedServiceNames() { return {"com.sun.star.accessibility.AccessibleContext", "com.sun.star.accessibility.AccessibleComponent", @@ -313,21 +313,21 @@ Sequence< OUString > VCLXAccessibleToolBoxItem::getSupportedServiceNames() throw // XAccessible -Reference< XAccessibleContext > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleContext( ) throw (RuntimeException, std::exception) +Reference< XAccessibleContext > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleContext( ) { return this; } // XAccessibleContext -sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleChildCount( ) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleChildCount( ) { OContextEntryGuard aGuard( this ); return m_xChild.is() ? 1 : 0; } -Reference< XAccessible > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleChild( sal_Int32 i ) throw (RuntimeException, css::lang::IndexOutOfBoundsException, std::exception) +Reference< XAccessible > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleChild( sal_Int32 i ) { OContextEntryGuard aGuard( this ); @@ -338,28 +338,28 @@ Reference< XAccessible > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleChild( return m_xChild; } -Reference< XAccessible > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleParent( ) throw (RuntimeException, std::exception) +Reference< XAccessible > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleParent( ) { OContextEntryGuard aGuard( this ); return m_pToolBox->GetAccessible(); } -sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleIndexInParent( ) { OContextEntryGuard aGuard( this ); return m_nIndexInParent; } -sal_Int16 SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleRole( ) throw (RuntimeException, std::exception) +sal_Int16 SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleRole( ) { OContextEntryGuard aGuard( this ); return m_nRole; } -OUString SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleDescription( ) throw (RuntimeException, std::exception) +OUString SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleDescription( ) { OExternalLockGuard aGuard( this ); @@ -376,7 +376,7 @@ OUString SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleDescription( ) throw } } -OUString SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleName( ) throw (RuntimeException, std::exception) +OUString SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleName( ) { OExternalLockGuard aGuard( this ); @@ -384,7 +384,7 @@ OUString SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleName( ) throw (Runtim return GetText(); } -Reference< XAccessibleRelationSet > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) +Reference< XAccessibleRelationSet > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleRelationSet( ) { OContextEntryGuard aGuard( this ); @@ -393,7 +393,7 @@ Reference< XAccessibleRelationSet > SAL_CALL VCLXAccessibleToolBoxItem::getAcces return xSet; } -Reference< XAccessibleStateSet > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleStateSet( ) throw (RuntimeException, std::exception) +Reference< XAccessibleStateSet > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleStateSet( ) { OExternalLockGuard aGuard( this ); @@ -427,12 +427,12 @@ Reference< XAccessibleStateSet > SAL_CALL VCLXAccessibleToolBoxItem::getAccessib // XAccessibleText -sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getCaretPosition() throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getCaretPosition() { return -1; } -sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::setCaretPosition( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::setCaretPosition( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); @@ -442,7 +442,7 @@ sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::setCaretPosition( sal_Int32 nIndex return false; } -Sequence< PropertyValue > SAL_CALL VCLXAccessibleToolBoxItem::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Sequence< PropertyValue > SAL_CALL VCLXAccessibleToolBoxItem::getCharacterAttributes( sal_Int32 nIndex, const Sequence< OUString >& ) { OExternalLockGuard aGuard( this ); @@ -454,7 +454,7 @@ Sequence< PropertyValue > SAL_CALL VCLXAccessibleToolBoxItem::getCharacterAttrib return Sequence< PropertyValue >(); } -awt::Rectangle SAL_CALL VCLXAccessibleToolBoxItem::getCharacterBounds( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +awt::Rectangle SAL_CALL VCLXAccessibleToolBoxItem::getCharacterBounds( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); @@ -475,7 +475,7 @@ awt::Rectangle SAL_CALL VCLXAccessibleToolBoxItem::getCharacterBounds( sal_Int32 return aBounds; } -sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getIndexAtPoint( const awt::Point& aPoint ) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getIndexAtPoint( const awt::Point& aPoint ) { OExternalLockGuard aGuard( this ); @@ -494,7 +494,7 @@ sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getIndexAtPoint( const awt::Point& return nIndex; } -sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::setSelection( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { OExternalLockGuard aGuard( this ); @@ -504,7 +504,7 @@ sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::setSelection( sal_Int32 nStartIndex return false; } -sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::copyText( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { OExternalLockGuard aGuard( this ); @@ -538,12 +538,12 @@ sal_Bool SAL_CALL VCLXAccessibleToolBoxItem::copyText( sal_Int32 nStartIndex, sa // XAccessibleComponent -Reference< XAccessible > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException, std::exception) +Reference< XAccessible > SAL_CALL VCLXAccessibleToolBoxItem::getAccessibleAtPoint( const awt::Point& ) { return Reference< XAccessible >(); } -void SAL_CALL VCLXAccessibleToolBoxItem::grabFocus( ) throw (RuntimeException, std::exception) +void SAL_CALL VCLXAccessibleToolBoxItem::grabFocus( ) { Reference< XAccessible > xParent(getAccessibleParent()); @@ -558,7 +558,7 @@ void SAL_CALL VCLXAccessibleToolBoxItem::grabFocus( ) throw (RuntimeException, } } -sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getForeground( ) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getForeground( ) { OExternalLockGuard aGuard( this ); @@ -569,7 +569,7 @@ sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getForeground( ) throw (RuntimeEx return nColor; } -sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getBackground( ) throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getBackground( ) { OExternalLockGuard aGuard( this ); @@ -581,12 +581,12 @@ sal_Int32 SAL_CALL VCLXAccessibleToolBoxItem::getBackground( ) throw (RuntimeEx } // XAccessibleExtendedComponent -Reference< awt::XFont > SAL_CALL VCLXAccessibleToolBoxItem::getFont( ) throw (RuntimeException, std::exception) +Reference< awt::XFont > SAL_CALL VCLXAccessibleToolBoxItem::getFont( ) { return uno::Reference< awt::XFont >(); } -OUString SAL_CALL VCLXAccessibleToolBoxItem::getTitledBorderText( ) throw (RuntimeException, std::exception) +OUString SAL_CALL VCLXAccessibleToolBoxItem::getTitledBorderText( ) { OExternalLockGuard aGuard( this ); @@ -597,7 +597,7 @@ OUString SAL_CALL VCLXAccessibleToolBoxItem::getTitledBorderText( ) throw (Runt return sRet; } -OUString SAL_CALL VCLXAccessibleToolBoxItem::getToolTipText( ) throw (RuntimeException, std::exception) +OUString SAL_CALL VCLXAccessibleToolBoxItem::getToolTipText( ) { OExternalLockGuard aGuard( this ); @@ -617,13 +617,13 @@ OUString SAL_CALL VCLXAccessibleToolBoxItem::getToolTipText( ) throw (RuntimeEx // XAccessibleAction -sal_Int32 VCLXAccessibleToolBoxItem::getAccessibleActionCount( ) throw (RuntimeException, std::exception) +sal_Int32 VCLXAccessibleToolBoxItem::getAccessibleActionCount( ) { // only one action -> "Click" return 1; } -sal_Bool VCLXAccessibleToolBoxItem::doAccessibleAction ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool VCLXAccessibleToolBoxItem::doAccessibleAction ( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); @@ -636,7 +636,7 @@ sal_Bool VCLXAccessibleToolBoxItem::doAccessibleAction ( sal_Int32 nIndex ) thro return true; } -OUString VCLXAccessibleToolBoxItem::getAccessibleActionDescription ( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +OUString VCLXAccessibleToolBoxItem::getAccessibleActionDescription ( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); @@ -646,7 +646,7 @@ OUString VCLXAccessibleToolBoxItem::getAccessibleActionDescription ( sal_Int32 n return OUString( TK_RES_STRING( RID_STR_ACC_ACTION_CLICK ) ); } -Reference< XAccessibleKeyBinding > VCLXAccessibleToolBoxItem::getAccessibleActionKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XAccessibleKeyBinding > VCLXAccessibleToolBoxItem::getAccessibleActionKeyBinding( sal_Int32 nIndex ) { OContextEntryGuard aGuard( this ); @@ -658,7 +658,7 @@ Reference< XAccessibleKeyBinding > VCLXAccessibleToolBoxItem::getAccessibleActio // XAccessibleValue -Any VCLXAccessibleToolBoxItem::getCurrentValue( ) throw (RuntimeException, std::exception) +Any VCLXAccessibleToolBoxItem::getCurrentValue( ) { OExternalLockGuard aGuard( this ); @@ -671,7 +671,7 @@ Any VCLXAccessibleToolBoxItem::getCurrentValue( ) throw (RuntimeException, std: return aValue; } -sal_Bool VCLXAccessibleToolBoxItem::setCurrentValue( const Any& aNumber ) throw (RuntimeException, std::exception) +sal_Bool VCLXAccessibleToolBoxItem::setCurrentValue( const Any& aNumber ) { OExternalLockGuard aGuard( this ); @@ -694,12 +694,12 @@ sal_Bool VCLXAccessibleToolBoxItem::setCurrentValue( const Any& aNumber ) throw return bReturn; } -Any VCLXAccessibleToolBoxItem::getMaximumValue( ) throw (RuntimeException, std::exception) +Any VCLXAccessibleToolBoxItem::getMaximumValue( ) { return makeAny((sal_Int32)1); } -Any VCLXAccessibleToolBoxItem::getMinimumValue( ) throw (RuntimeException, std::exception) +Any VCLXAccessibleToolBoxItem::getMinimumValue( ) { return makeAny((sal_Int32)0); } diff --git a/animations/source/animcore/animcore.cxx b/animations/source/animcore/animcore.cxx index db17efc1b558..77a5d0d77374 100644 --- a/animations/source/animcore/animcore.cxx +++ b/animations/source/animcore/animcore.cxx @@ -131,154 +131,154 @@ public: explicit AnimationNode(const AnimationNode& rNode); // XInterface - virtual Any SAL_CALL queryInterface( const Type& aType ) throw (RuntimeException, std::exception) override; + virtual Any SAL_CALL queryInterface( const Type& aType ) override; virtual void SAL_CALL acquire() throw () override; virtual void SAL_CALL release() throw () override; // XTypeProvider - virtual Sequence< Type > SAL_CALL getTypes() throw (RuntimeException, std::exception) override; - virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (RuntimeException, std::exception) override; + virtual Sequence< Type > SAL_CALL getTypes() override; + virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() override; // XServiceInfo - OUString SAL_CALL getImplementationName() throw(std::exception) override; - Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(std::exception) override; - sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw(std::exception) override; + OUString SAL_CALL getImplementationName() override; + Sequence< OUString > SAL_CALL getSupportedServiceNames() override; + sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; // XChild - virtual Reference< XInterface > SAL_CALL getParent() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setParent( const Reference< XInterface >& Parent ) throw (NoSupportException, RuntimeException, std::exception) override; + virtual Reference< XInterface > SAL_CALL getParent() override; + virtual void SAL_CALL setParent( const Reference< XInterface >& Parent ) override; // XCloneable - virtual Reference< XCloneable > SAL_CALL createClone() throw (RuntimeException, std::exception) override; + virtual Reference< XCloneable > SAL_CALL createClone() override; // XAnimationNode - virtual sal_Int16 SAL_CALL getType() throw (RuntimeException, std::exception) override; - virtual Any SAL_CALL getBegin() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setBegin( const Any& _begin ) throw (RuntimeException, std::exception) override; - virtual Any SAL_CALL getDuration() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setDuration( const Any& _duration ) throw (RuntimeException, std::exception) override; - virtual Any SAL_CALL getEnd() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setEnd( const Any& _end ) throw (RuntimeException, std::exception) override; - virtual Any SAL_CALL getEndSync() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setEndSync( const Any& _endsync ) throw (RuntimeException, std::exception) override; - virtual Any SAL_CALL getRepeatCount() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setRepeatCount( const Any& _repeatcount ) throw (RuntimeException, std::exception) override; - virtual Any SAL_CALL getRepeatDuration() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setRepeatDuration( const Any& _repeatduration ) throw (RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getFill() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setFill( sal_Int16 _fill ) throw (RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getFillDefault() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setFillDefault( sal_Int16 _filldefault ) throw (RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getRestart() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setRestart( sal_Int16 _restart ) throw (RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getRestartDefault() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setRestartDefault( sal_Int16 _restartdefault ) throw (RuntimeException, std::exception) override; - virtual double SAL_CALL getAcceleration() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setAcceleration( double _acceleration ) throw (RuntimeException, std::exception) override; - virtual double SAL_CALL getDecelerate() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setDecelerate( double _decelerate ) throw (RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getAutoReverse() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setAutoReverse( sal_Bool _autoreverse ) throw (RuntimeException, std::exception) override; - virtual Sequence< NamedValue > SAL_CALL getUserData() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setUserData( const Sequence< NamedValue >& _userdata ) throw (RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getType() override; + virtual Any SAL_CALL getBegin() override; + virtual void SAL_CALL setBegin( const Any& _begin ) override; + virtual Any SAL_CALL getDuration() override; + virtual void SAL_CALL setDuration( const Any& _duration ) override; + virtual Any SAL_CALL getEnd() override; + virtual void SAL_CALL setEnd( const Any& _end ) override; + virtual Any SAL_CALL getEndSync() override; + virtual void SAL_CALL setEndSync( const Any& _endsync ) override; + virtual Any SAL_CALL getRepeatCount() override; + virtual void SAL_CALL setRepeatCount( const Any& _repeatcount ) override; + virtual Any SAL_CALL getRepeatDuration() override; + virtual void SAL_CALL setRepeatDuration( const Any& _repeatduration ) override; + virtual sal_Int16 SAL_CALL getFill() override; + virtual void SAL_CALL setFill( sal_Int16 _fill ) override; + virtual sal_Int16 SAL_CALL getFillDefault() override; + virtual void SAL_CALL setFillDefault( sal_Int16 _filldefault ) override; + virtual sal_Int16 SAL_CALL getRestart() override; + virtual void SAL_CALL setRestart( sal_Int16 _restart ) override; + virtual sal_Int16 SAL_CALL getRestartDefault() override; + virtual void SAL_CALL setRestartDefault( sal_Int16 _restartdefault ) override; + virtual double SAL_CALL getAcceleration() override; + virtual void SAL_CALL setAcceleration( double _acceleration ) override; + virtual double SAL_CALL getDecelerate() override; + virtual void SAL_CALL setDecelerate( double _decelerate ) override; + virtual sal_Bool SAL_CALL getAutoReverse() override; + virtual void SAL_CALL setAutoReverse( sal_Bool _autoreverse ) override; + virtual Sequence< NamedValue > SAL_CALL getUserData() override; + virtual void SAL_CALL setUserData( const Sequence< NamedValue >& _userdata ) override; // XAnimate - virtual Any SAL_CALL getTarget() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setTarget( const Any& _target ) throw (RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getSubItem() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setSubItem( sal_Int16 _subitem ) throw (RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAttributeName() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setAttributeName( const OUString& _attribute ) throw (RuntimeException, std::exception) override; - virtual Sequence< Any > SAL_CALL getValues() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setValues( const Sequence< Any >& _values ) throw (RuntimeException, std::exception) override; - virtual Sequence< double > SAL_CALL getKeyTimes() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setKeyTimes( const Sequence< double >& _keytimes ) throw (RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getValueType() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setValueType( sal_Int16 _valuetype ) throw (RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getCalcMode() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setCalcMode( sal_Int16 _calcmode ) throw (RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getAccumulate() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setAccumulate( sal_Bool _accumulate ) throw (RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getAdditive() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setAdditive( sal_Int16 _additive ) throw (RuntimeException, std::exception) override; - virtual Any SAL_CALL getFrom() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setFrom( const Any& _from ) throw (RuntimeException, std::exception) override; - virtual Any SAL_CALL getTo() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setTo( const Any& _to ) throw (RuntimeException, std::exception) override; - virtual Any SAL_CALL getBy() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setBy( const Any& _by ) throw (RuntimeException, std::exception) override; - virtual Sequence< TimeFilterPair > SAL_CALL getTimeFilter() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setTimeFilter( const Sequence< TimeFilterPair >& _timefilter ) throw (RuntimeException, std::exception) override; - virtual OUString SAL_CALL getFormula() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setFormula( const OUString& _formula ) throw (RuntimeException, std::exception) override; + virtual Any SAL_CALL getTarget() override; + virtual void SAL_CALL setTarget( const Any& _target ) override; + virtual sal_Int16 SAL_CALL getSubItem() override; + virtual void SAL_CALL setSubItem( sal_Int16 _subitem ) override; + virtual OUString SAL_CALL getAttributeName() override; + virtual void SAL_CALL setAttributeName( const OUString& _attribute ) override; + virtual Sequence< Any > SAL_CALL getValues() override; + virtual void SAL_CALL setValues( const Sequence< Any >& _values ) override; + virtual Sequence< double > SAL_CALL getKeyTimes() override; + virtual void SAL_CALL setKeyTimes( const Sequence< double >& _keytimes ) override; + virtual sal_Int16 SAL_CALL getValueType() override; + virtual void SAL_CALL setValueType( sal_Int16 _valuetype ) override; + virtual sal_Int16 SAL_CALL getCalcMode() override; + virtual void SAL_CALL setCalcMode( sal_Int16 _calcmode ) override; + virtual sal_Bool SAL_CALL getAccumulate() override; + virtual void SAL_CALL setAccumulate( sal_Bool _accumulate ) override; + virtual sal_Int16 SAL_CALL getAdditive() override; + virtual void SAL_CALL setAdditive( sal_Int16 _additive ) override; + virtual Any SAL_CALL getFrom() override; + virtual void SAL_CALL setFrom( const Any& _from ) override; + virtual Any SAL_CALL getTo() override; + virtual void SAL_CALL setTo( const Any& _to ) override; + virtual Any SAL_CALL getBy() override; + virtual void SAL_CALL setBy( const Any& _by ) override; + virtual Sequence< TimeFilterPair > SAL_CALL getTimeFilter() override; + virtual void SAL_CALL setTimeFilter( const Sequence< TimeFilterPair >& _timefilter ) override; + virtual OUString SAL_CALL getFormula() override; + virtual void SAL_CALL setFormula( const OUString& _formula ) override; // XAnimateColor - virtual sal_Int16 SAL_CALL getColorInterpolation() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setColorInterpolation( sal_Int16 _colorspace ) throw (RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getDirection() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setDirection( sal_Bool _direction ) throw (RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getColorInterpolation() override; + virtual void SAL_CALL setColorInterpolation( sal_Int16 _colorspace ) override; + virtual sal_Bool SAL_CALL getDirection() override; + virtual void SAL_CALL setDirection( sal_Bool _direction ) override; // XAnimateMotion - virtual Any SAL_CALL getPath() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setPath( const Any& _path ) throw (RuntimeException, std::exception) override; - virtual Any SAL_CALL getOrigin() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setOrigin( const Any& _origin ) throw (RuntimeException, std::exception) override; + virtual Any SAL_CALL getPath() override; + virtual void SAL_CALL setPath( const Any& _path ) override; + virtual Any SAL_CALL getOrigin() override; + virtual void SAL_CALL setOrigin( const Any& _origin ) override; // XAnimateTransform - virtual sal_Int16 SAL_CALL getTransformType() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setTransformType( sal_Int16 _transformtype ) throw (RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getTransformType() override; + virtual void SAL_CALL setTransformType( sal_Int16 _transformtype ) override; // XTransitionFilter - virtual sal_Int16 SAL_CALL getTransition() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setTransition( sal_Int16 _transition ) throw (RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getSubtype() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setSubtype( sal_Int16 _subtype ) throw (RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getMode() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setMode( sal_Bool _mode ) throw (RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getFadeColor() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setFadeColor( sal_Int32 _fadecolor ) throw (RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getTransition() override; + virtual void SAL_CALL setTransition( sal_Int16 _transition ) override; + virtual sal_Int16 SAL_CALL getSubtype() override; + virtual void SAL_CALL setSubtype( sal_Int16 _subtype ) override; + virtual sal_Bool SAL_CALL getMode() override; + virtual void SAL_CALL setMode( sal_Bool _mode ) override; + virtual sal_Int32 SAL_CALL getFadeColor() override; + virtual void SAL_CALL setFadeColor( sal_Int32 _fadecolor ) override; // XAudio - virtual Any SAL_CALL getSource() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setSource( const Any& _source ) throw (RuntimeException, std::exception) override; - virtual double SAL_CALL getVolume() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setVolume( double _volume ) throw (RuntimeException, std::exception) override; + virtual Any SAL_CALL getSource() override; + virtual void SAL_CALL setSource( const Any& _source ) override; + virtual double SAL_CALL getVolume() override; + virtual void SAL_CALL setVolume( double _volume ) override; // XCommand - the following two shadowed by animate, unfortunately // virtual Any SAL_CALL getTarget() throw (RuntimeException); // virtual void SAL_CALL setTarget( const Any& _target ) throw (RuntimeException); - virtual sal_Int16 SAL_CALL getCommand() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setCommand( sal_Int16 _command ) throw (RuntimeException, std::exception) override; - virtual Any SAL_CALL getParameter() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setParameter( const Any& _parameter ) throw (RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getCommand() override; + virtual void SAL_CALL setCommand( sal_Int16 _command ) override; + virtual Any SAL_CALL getParameter() override; + virtual void SAL_CALL setParameter( const Any& _parameter ) override; // XElementAccess - virtual Type SAL_CALL getElementType() throw (RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw (RuntimeException, std::exception) override; + virtual Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() override; // XEnumerationAccess - virtual Reference< XEnumeration > SAL_CALL createEnumeration() throw (RuntimeException, std::exception) override; + virtual Reference< XEnumeration > SAL_CALL createEnumeration() override; // XTimeContainer - virtual Reference< XAnimationNode > SAL_CALL insertBefore( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild ) throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) override; - virtual Reference< XAnimationNode > SAL_CALL insertAfter( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild ) throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) override; - virtual Reference< XAnimationNode > SAL_CALL replaceChild( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& oldChild ) throw( IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) override; - virtual Reference< XAnimationNode > SAL_CALL removeChild( const Reference< XAnimationNode >& oldChild ) throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override; - virtual Reference< XAnimationNode > SAL_CALL appendChild( const Reference< XAnimationNode >& newChild ) throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) override; + virtual Reference< XAnimationNode > SAL_CALL insertBefore( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild ) override; + virtual Reference< XAnimationNode > SAL_CALL insertAfter( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild ) override; + virtual Reference< XAnimationNode > SAL_CALL replaceChild( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& oldChild ) override; + virtual Reference< XAnimationNode > SAL_CALL removeChild( const Reference< XAnimationNode >& oldChild ) override; + virtual Reference< XAnimationNode > SAL_CALL appendChild( const Reference< XAnimationNode >& newChild ) override; // XIterateContainer - virtual sal_Int16 SAL_CALL getIterateType() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setIterateType( sal_Int16 _iteratetype ) throw (RuntimeException, std::exception) override; - virtual double SAL_CALL getIterateInterval() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL setIterateInterval( double _iterateinterval ) throw (RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getIterateType() override; + virtual void SAL_CALL setIterateType( sal_Int16 _iteratetype ) override; + virtual double SAL_CALL getIterateInterval() override; + virtual void SAL_CALL setIterateInterval( double _iterateinterval ) override; // XChangesNotifier - virtual void SAL_CALL addChangesListener( const Reference< XChangesListener >& aListener ) throw (RuntimeException, std::exception) override; - virtual void SAL_CALL removeChangesListener( const Reference< XChangesListener >& aListener ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL addChangesListener( const Reference< XChangesListener >& aListener ) override; + virtual void SAL_CALL removeChangesListener( const Reference< XChangesListener >& aListener ) override; // XUnoTunnel - virtual ::sal_Int64 SAL_CALL getSomething( const Sequence< ::sal_Int8 >& aIdentifier ) throw (RuntimeException, std::exception) override; + virtual ::sal_Int64 SAL_CALL getSomething( const Sequence< ::sal_Int8 >& aIdentifier ) override; static const Sequence< sal_Int8 > & getUnoTunnelId(); void fireChangeListener(); @@ -353,8 +353,8 @@ public: explicit TimeContainerEnumeration( const ChildList_t &rChildren ); // Methods - virtual sal_Bool SAL_CALL hasMoreElements() throw (RuntimeException, std::exception) override; - virtual Any SAL_CALL nextElement( ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasMoreElements() override; + virtual Any SAL_CALL nextElement( ) override; private: /** sorted list of child nodes */ @@ -374,7 +374,7 @@ TimeContainerEnumeration::TimeContainerEnumeration( const ChildList_t &rChildren } // Methods -sal_Bool SAL_CALL TimeContainerEnumeration::hasMoreElements() throw (RuntimeException, std::exception) +sal_Bool SAL_CALL TimeContainerEnumeration::hasMoreElements() { Guard< Mutex > aGuard( maMutex ); @@ -382,7 +382,6 @@ sal_Bool SAL_CALL TimeContainerEnumeration::hasMoreElements() throw (RuntimeExce } Any SAL_CALL TimeContainerEnumeration::nextElement() - throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); @@ -605,7 +604,7 @@ OUString getImplementationName_COMMAND() } // XInterface -Any SAL_CALL AnimationNode::queryInterface( const Type& aType ) throw (RuntimeException, std::exception) +Any SAL_CALL AnimationNode::queryInterface( const Type& aType ) { Any aRet( ::cppu::queryInterface( aType, @@ -771,7 +770,7 @@ void AnimationNode::initTypeProvider( sal_Int16 nNodeType ) throw() } -Sequence< Type > AnimationNode::getTypes() throw (RuntimeException, std::exception) +Sequence< Type > AnimationNode::getTypes() { if (! mpTypes[mnNodeType]) initTypeProvider(mnNodeType); @@ -779,7 +778,7 @@ Sequence< Type > AnimationNode::getTypes() throw (RuntimeException, std::excepti } -Sequence< sal_Int8 > AnimationNode::getImplementationId() throw (RuntimeException, std::exception) +Sequence< sal_Int8 > AnimationNode::getImplementationId() { return css::uno::Sequence(); } @@ -800,7 +799,7 @@ void SAL_CALL AnimationNode::release( ) throw () // XServiceInfo -OUString AnimationNode::getImplementationName() throw(std::exception) +OUString AnimationNode::getImplementationName() { switch( mnNodeType ) { @@ -831,13 +830,13 @@ OUString AnimationNode::getImplementationName() throw(std::exception) } // XServiceInfo -sal_Bool AnimationNode::supportsService(const OUString& ServiceName) throw(std::exception) +sal_Bool AnimationNode::supportsService(const OUString& ServiceName) { return cppu::supportsService(this, ServiceName); } // XServiceInfo -Sequence< OUString > AnimationNode::getSupportedServiceNames() throw(std::exception) +Sequence< OUString > AnimationNode::getSupportedServiceNames() { switch( mnNodeType ) { @@ -869,7 +868,7 @@ Sequence< OUString > AnimationNode::getSupportedServiceNames() throw(std::except // XAnimationNode -sal_Int16 SAL_CALL AnimationNode::getType() throw (RuntimeException, std::exception) +sal_Int16 SAL_CALL AnimationNode::getType() { Guard< Mutex > aGuard( maMutex ); return mnNodeType; @@ -877,7 +876,7 @@ sal_Int16 SAL_CALL AnimationNode::getType() throw (RuntimeException, std::except // XAnimationNode -Any SAL_CALL AnimationNode::getBegin() throw (RuntimeException, std::exception) +Any SAL_CALL AnimationNode::getBegin() { Guard< Mutex > aGuard( maMutex ); return maBegin; @@ -885,7 +884,7 @@ Any SAL_CALL AnimationNode::getBegin() throw (RuntimeException, std::exception) // XAnimationNode -void SAL_CALL AnimationNode::setBegin( const Any& _begin ) throw (RuntimeException, std::exception) +void SAL_CALL AnimationNode::setBegin( const Any& _begin ) { Guard< Mutex > aGuard( maMutex ); if( _begin != maBegin ) @@ -897,7 +896,7 @@ void SAL_CALL AnimationNode::setBegin( const Any& _begin ) throw (RuntimeExcepti // XAnimationNode -Any SAL_CALL AnimationNode::getDuration() throw (RuntimeException, std::exception) +Any SAL_CALL AnimationNode::getDuration() { Guard< Mutex > aGuard( maMutex ); return maDuration; @@ -905,7 +904,7 @@ Any SAL_CALL AnimationNode::getDuration() throw (RuntimeException, std::exceptio // XAnimationNode -void SAL_CALL AnimationNode::setDuration( const Any& _duration ) throw (RuntimeException, std::exception) +void SAL_CALL AnimationNode::setDuration( const Any& _duration ) { Guard< Mutex > aGuard( maMutex ); if( _duration != maDuration ) @@ -917,7 +916,7 @@ void SAL_CALL AnimationNode::setDuration( const Any& _duration ) throw (RuntimeE // XAnimationNode -Any SAL_CALL AnimationNode::getEnd() throw (RuntimeException, std::exception) +Any SAL_CALL AnimationNode::getEnd() { Guard< Mutex > aGuard( maMutex ); return maEnd; @@ -925,7 +924,7 @@ Any SAL_CALL AnimationNode::getEnd() throw (RuntimeException, std::exception) // XAnimationNode -void SAL_CALL AnimationNode::setEnd( const Any& _end ) throw (RuntimeException, std::exception) +void SAL_CALL AnimationNode::setEnd( const Any& _end ) { Guard< Mutex > aGuard( maMutex ); if( _end != maEnd ) @@ -937,7 +936,7 @@ void SAL_CALL AnimationNode::setEnd( const Any& _end ) throw (RuntimeException, // XAnimationNode -Any SAL_CALL AnimationNode::getEndSync() throw (RuntimeException, std::exception) +Any SAL_CALL AnimationNode::getEndSync() { Guard< Mutex > aGuard( maMutex ); return maEndSync; @@ -945,7 +944,7 @@ Any SAL_CALL AnimationNode::getEndSync() throw (RuntimeException, std::exception // XAnimationNode -void SAL_CALL AnimationNode::setEndSync( const Any& _endsync ) throw (RuntimeException, std::exception) +void SAL_CALL AnimationNode::setEndSync( const Any& _endsync ) { Guard< Mutex > aGuard( maMutex ); if( _endsync != maEndSync ) @@ -957,7 +956,7 @@ void SAL_CALL AnimationNode::setEndSync( const Any& _endsync ) throw (RuntimeExc // XAnimationNode -Any SAL_CALL AnimationNode::getRepeatCount() throw (RuntimeException, std::exception) +Any SAL_CALL AnimationNode::getRepeatCount() { Guard< Mutex > aGuard( maMutex ); return maRepeatCount; @@ -965,7 +964,7 @@ Any SAL_CALL AnimationNode::getRepeatCount() throw (RuntimeException, std::excep // XAnimationNode -void SAL_CALL AnimationNode::setRepeatCount( const Any& _repeatcount ) throw (RuntimeException, std::exception) +void SAL_CALL AnimationNode::setRepeatCount( const Any& _repeatcount ) { Guard< Mutex > aGuard( maMutex ); if( _repeatcount != maRepeatCount ) @@ -977,7 +976,7 @@ void SAL_CALL AnimationNode::setRepeatCount( const Any& _repeatcount ) throw (Ru // XAnimationNode -Any SAL_CALL AnimationNode::getRepeatDuration() throw (RuntimeException, std::exception) +Any SAL_CALL AnimationNode::getRepeatDuration() { Guard< Mutex > aGuard( maMutex ); return maRepeatDuration; @@ -985,7 +984,7 @@ Any SAL_CALL AnimationNode::getRepeatDuration() throw (RuntimeException, std::ex // XAnimationNode -void SAL_CALL AnimationNode::setRepeatDuration( const Any& _repeatduration ) throw (RuntimeException, std::exception) +void SAL_CALL AnimationNode::setRepeatDuration( const Any& _repeatduration ) { Guard< Mutex > aGuard( maMutex ); if( _repeatduration != maRepeatDuration ) @@ -997,7 +996,7 @@ void SAL_CALL AnimationNode::setRepeatDuration( const Any& _repeatduration ) thr // XAnimationNode -sal_Int16 SAL_CALL AnimationNode::getFill() throw (RuntimeException, std::exception) +sal_Int16 SAL_CALL AnimationNode::getFill() { Guard< Mutex > aGuard( maMutex ); return mnFill; @@ -1005,7 +1004,7 @@ sal_Int16 SAL_CALL AnimationNode::getFill() throw (RuntimeException, std::except // XAnimationNode -void SAL_CALL AnimationNode::setFill( sal_Int16 _fill ) throw (RuntimeException, std::exception) +void SAL_CALL AnimationNode::setFill( sal_Int16 _fill ) { Guard< Mutex > aGuard( maMutex ); if( _fill != mnFill ) @@ -1017,7 +1016,7 @@ void SAL_CALL AnimationNode::setFill( sal_Int16 _fill ) throw (RuntimeException, // XAnimationNode -sal_Int16 SAL_CALL AnimationNode::getFillDefault() throw (RuntimeException, std::exception) +sal_Int16 SAL_CALL AnimationNode::getFillDefault() { Guard< Mutex > aGuard( maMutex ); return mnFillDefault; @@ -1025,7 +1024,7 @@ sal_Int16 SAL_CALL AnimationNode::getFillDefault() throw (RuntimeException, std: // XAnimationNode -void SAL_CALL AnimationNode::setFillDefault( sal_Int16 _filldefault ) throw (RuntimeException, std::exception) +void SAL_CALL AnimationNode::setFillDefault( sal_Int16 _filldefault ) { Guard< Mutex > aGuard( maMutex ); if( _filldefault != mnFillDefault ) @@ -1037,7 +1036,7 @@ void SAL_CALL AnimationNode::setFillDefault( sal_Int16 _filldefault ) throw (Run // XAnimationNode -sal_Int16 SAL_CALL AnimationNode::getRestart() throw (RuntimeException, std::exception) +sal_Int16 SAL_CALL AnimationNode::getRestart() { Guard< Mutex > aGuard( maMutex ); return mnRestart; @@ -1045,7 +1044,7 @@ sal_Int16 SAL_CALL AnimationNode::getRestart() throw (RuntimeException, std::exc // XAnimationNode -void SAL_CALL AnimationNode::setRestart( sal_Int16 _restart ) throw (RuntimeException, std::exception) +void SAL_CALL AnimationNode::setRestart( sal_Int16 _restart ) { Guard< Mutex > aGuard( maMutex ); if( _restart != mnRestart ) @@ -1057,7 +1056,7 @@ void SAL_CALL AnimationNode::setRestart( sal_Int16 _restart ) throw (RuntimeExce // XAnimationNode -sal_Int16 SAL_CALL AnimationNode::getRestartDefault() throw (RuntimeException, std::exception) +sal_Int16 SAL_CALL AnimationNode::getRestartDefault() { Guard< Mutex > aGuard( maMutex ); return mnRestartDefault; @@ -1065,7 +1064,7 @@ sal_Int16 SAL_CALL AnimationNode::getRestartDefault() throw (RuntimeException, s // XAnimationNode -void SAL_CALL AnimationNode::setRestartDefault( sal_Int16 _restartdefault ) throw (RuntimeException, std::exception) +void SAL_CALL AnimationNode::setRestartDefault( sal_Int16 _restartdefault ) { Guard< Mutex > aGuard( maMutex ); if( _restartdefault != mnRestartDefault ) @@ -1077,7 +1076,7 @@ void SAL_CALL AnimationNode::setRestartDefault( sal_Int16 _restartdefault ) thro // XAnimationNode -double SAL_CALL AnimationNode::getAcceleration() throw (RuntimeException, std::exception) +double SAL_CALL AnimationNode::getAcceleration() { Guard< Mutex > aGuard( maMutex ); return mfAcceleration; @@ -1085,7 +1084,7 @@ double SAL_CALL AnimationNode::getAcceleration() throw (RuntimeException, std::e // XAnimationNode -void SAL_CALL AnimationNode::setAcceleration( double _acceleration ) throw (RuntimeException, std::exception) +void SAL_CALL AnimationNode::setAcceleration( double _acceleration ) { Guard< Mutex > aGuard( maMutex ); if( _acceleration != mfAcceleration ) @@ -1097,7 +1096,7 @@ void SAL_CALL AnimationNode::setAcceleration( double _acceleration ) throw (Runt // XAnimationNode -double SAL_CALL AnimationNode::getDecelerate() throw (RuntimeException, std::exception) +double SAL_CALL AnimationNode::getDecelerate() { Guard< Mutex > aGuard( maMutex ); return mfDecelerate; @@ -1105,7 +1104,7 @@ double SAL_CALL AnimationNode::getDecelerate() throw (RuntimeException, std::exc // XAnimationNode -void SAL_CALL AnimationNode::setDecelerate( double _decelerate ) throw (RuntimeException, std::exception) +void SAL_CALL AnimationNode::setDecelerate( double _decelerate ) { Guard< Mutex > aGuard( maMutex ); if( _decelerate != mfDecelerate ) @@ -1117,7 +1116,7 @@ void SAL_CALL AnimationNode::setDecelerate( double _decelerate ) throw (RuntimeE // XAnimationNode -sal_Bool SAL_CALL AnimationNode::getAutoReverse() throw (RuntimeException, std::exception) +sal_Bool SAL_CALL AnimationNode::getAutoReverse() { Guard< Mutex > aGuard( maMutex ); return mbAutoReverse; @@ -1125,7 +1124,7 @@ sal_Bool SAL_CALL AnimationNode::getAutoReverse() throw (RuntimeException, std:: // XAnimationNode -void SAL_CALL AnimationNode::setAutoReverse( sal_Bool _autoreverse ) throw (RuntimeException, std::exception) +void SAL_CALL AnimationNode::setAutoReverse( sal_Bool _autoreverse ) { Guard< Mutex > aGuard( maMutex ); if( bool(_autoreverse) != mbAutoReverse ) @@ -1136,14 +1135,14 @@ void SAL_CALL AnimationNode::setAutoReverse( sal_Bool _autoreverse ) throw (Runt } -Sequence< NamedValue > SAL_CALL AnimationNode::getUserData() throw (RuntimeException, std::exception) +Sequence< NamedValue > SAL_CALL AnimationNode::getUserData() { Guard< Mutex > aGuard( maMutex ); return maUserData; } -void SAL_CALL AnimationNode::setUserData( const Sequence< NamedValue >& _userdata ) throw (RuntimeException, std::exception) +void SAL_CALL AnimationNode::setUserData( const Sequence< NamedValue >& _userdata ) { Guard< Mutex > aGuard( maMutex ); maUserData = _userdata; @@ -1152,7 +1151,7 @@ void SAL_CALL AnimationNode::setUserData( const Sequence< NamedValue >& _userdat // XChild -Reference< XInterface > SAL_CALL AnimationNode::getParent() throw (RuntimeException, std::exception) +Reference< XInterface > SAL_CALL AnimationNode::getParent() { Guard< Mutex > aGuard( maMutex ); return mxParent.get(); @@ -1160,7 +1159,7 @@ Reference< XInterface > SAL_CALL AnimationNode::getParent() throw (RuntimeExcept // XChild -void SAL_CALL AnimationNode::setParent( const Reference< XInterface >& Parent ) throw (NoSupportException, RuntimeException, std::exception) +void SAL_CALL AnimationNode::setParent( const Reference< XInterface >& Parent ) { Guard< Mutex > aGuard( maMutex ); if( Parent != mxParent.get() ) @@ -1178,7 +1177,7 @@ void SAL_CALL AnimationNode::setParent( const Reference< XInterface >& Parent ) // XCloneable -Reference< XCloneable > SAL_CALL AnimationNode::createClone() throw (RuntimeException, std::exception) +Reference< XCloneable > SAL_CALL AnimationNode::createClone() { Guard< Mutex > aGuard( maMutex ); @@ -1222,7 +1221,6 @@ Reference< XCloneable > SAL_CALL AnimationNode::createClone() throw (RuntimeExce // XAnimate Any SAL_CALL AnimationNode::getTarget() - throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return maTarget; @@ -1231,7 +1229,6 @@ Any SAL_CALL AnimationNode::getTarget() // XAnimate void SAL_CALL AnimationNode::setTarget( const Any& _target ) - throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _target != maTarget ) @@ -1243,7 +1240,7 @@ void SAL_CALL AnimationNode::setTarget( const Any& _target ) // XAnimate -OUString SAL_CALL AnimationNode::getAttributeName() throw (RuntimeException, std::exception) +OUString SAL_CALL AnimationNode::getAttributeName() { Guard< Mutex > aGuard( maMutex ); return maAttributeName; @@ -1252,7 +1249,6 @@ OUString SAL_CALL AnimationNode::getAttributeName() throw (RuntimeException, std // XAnimate void SAL_CALL AnimationNode::setAttributeName( const OUString& _attribute ) - throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _attribute != maAttributeName ) @@ -1265,7 +1261,6 @@ void SAL_CALL AnimationNode::setAttributeName( const OUString& _attribute ) // XAnimate Sequence< Any > SAL_CALL AnimationNode::getValues() - throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return maValues; @@ -1274,7 +1269,6 @@ Sequence< Any > SAL_CALL AnimationNode::getValues() // XAnimate void SAL_CALL AnimationNode::setValues( const Sequence< Any >& _values ) - throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); maValues = _values; @@ -1283,7 +1277,7 @@ void SAL_CALL AnimationNode::setValues( const Sequence< Any >& _values ) // XAnimate -sal_Int16 SAL_CALL AnimationNode::getSubItem() throw (RuntimeException, std::exception) +sal_Int16 SAL_CALL AnimationNode::getSubItem() { Guard< Mutex > aGuard( maMutex ); return mnSubItem; @@ -1291,7 +1285,7 @@ sal_Int16 SAL_CALL AnimationNode::getSubItem() throw (RuntimeException, std::exc // XAnimate -void SAL_CALL AnimationNode::setSubItem( sal_Int16 _subitem ) throw (RuntimeException, std::exception) +void SAL_CALL AnimationNode::setSubItem( sal_Int16 _subitem ) { Guard< Mutex > aGuard( maMutex ); if( _subitem != mnSubItem ) @@ -1303,7 +1297,7 @@ void SAL_CALL AnimationNode::setSubItem( sal_Int16 _subitem ) throw (RuntimeExce // XAnimate -Sequence< double > SAL_CALL AnimationNode::getKeyTimes() throw (RuntimeException, std::exception) +Sequence< double > SAL_CALL AnimationNode::getKeyTimes() { Guard< Mutex > aGuard( maMutex ); return maKeyTimes; @@ -1311,7 +1305,7 @@ Sequence< double > SAL_CALL AnimationNode::getKeyTimes() throw (RuntimeException // XAnimate -void SAL_CALL AnimationNode::setKeyTimes( const Sequence< double >& _keytimes ) throw (RuntimeException, std::exception) +void SAL_CALL AnimationNode::setKeyTimes( const Sequence< double >& _keytimes ) { Guard< Mutex > aGuard( maMutex ); maKeyTimes = _keytimes; @@ -1320,14 +1314,14 @@ void SAL_CALL AnimationNode::setKeyTimes( const Sequence< double >& _keytimes ) // XAnimate -sal_Int16 SAL_CALL AnimationNode::getValueType() throw (RuntimeException, std::exception) +sal_Int16 SAL_CALL AnimationNode::getValueType() { Guard< Mutex > aGuard( maMutex ); return mnValueType; } -void SAL_CALL AnimationNode::setValueType( sal_Int16 _valuetype ) throw (RuntimeException, std::exception) +void SAL_CALL AnimationNode::setValueType( sal_Int16 _valuetype ) { Guard< Mutex > aGuard( maMutex ); if( _valuetype != mnValueType ) @@ -1340,7 +1334,6 @@ void SAL_CALL AnimationNode::setValueType( sal_Int16 _valuetype ) throw (Runtime // XAnimate sal_Int16 SAL_CALL AnimationNode::getCalcMode() - throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return mnCalcMode; @@ -1349,7 +1342,6 @@ sal_Int16 SAL_CALL AnimationNode::getCalcMode() // XAnimate void SAL_CALL AnimationNode::setCalcMode( sal_Int16 _calcmode ) - throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _calcmode != mnCalcMode ) @@ -1362,7 +1354,6 @@ void SAL_CALL AnimationNode::setCalcMode( sal_Int16 _calcmode ) // XAnimate sal_Bool SAL_CALL AnimationNode::getAccumulate() - throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return mbAccumulate; @@ -1371,7 +1362,6 @@ sal_Bool SAL_CALL AnimationNode::getAccumulate() // XAnimate void SAL_CALL AnimationNode::setAccumulate( sal_Bool _accumulate ) - throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( bool(_accumulate) != mbAccumulate ) @@ -1384,7 +1374,6 @@ void SAL_CALL AnimationNode::setAccumulate( sal_Bool _accumulate ) // XAnimate sal_Int16 SAL_CALL AnimationNode::getAdditive() - throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return mnAdditive; @@ -1393,7 +1382,6 @@ sal_Int16 SAL_CALL AnimationNode::getAdditive() // XAnimate void SAL_CALL AnimationNode::setAdditive( sal_Int16 _additive ) - throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _additive != mnAdditive ) @@ -1406,7 +1394,6 @@ void SAL_CALL AnimationNode::setAdditive( sal_Int16 _additive ) // XAnimate Any SAL_CALL AnimationNode::getFrom() - throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return maFrom; @@ -1415,7 +1402,6 @@ Any SAL_CALL AnimationNode::getFrom() // XAnimate void SAL_CALL AnimationNode::setFrom( const Any& _from ) - throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _from != maFrom ) @@ -1428,7 +1414,6 @@ void SAL_CALL AnimationNode::setFrom( const Any& _from ) // XAnimate Any SAL_CALL AnimationNode::getTo() - throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return maTo; @@ -1437,7 +1422,6 @@ Any SAL_CALL AnimationNode::getTo() // XAnimate void SAL_CALL AnimationNode::setTo( const Any& _to ) - throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _to != maTo ) @@ -1450,7 +1434,6 @@ void SAL_CALL AnimationNode::setTo( const Any& _to ) // XAnimate Any SAL_CALL AnimationNode::getBy() - throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return maBy; @@ -1459,7 +1442,6 @@ Any SAL_CALL AnimationNode::getBy() // XAnimate void SAL_CALL AnimationNode::setBy( const Any& _by ) - throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); if( _by != maBy ) @@ -1472,7 +1454,6 @@ void SAL_CALL AnimationNode::setBy( const Any& _by ) // XAnimate Sequence< TimeFilterPair > SAL_CALL AnimationNode::getTimeFilter() - throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); return maTimeFilter; @@ -1481,7 +1462,6 @@ Sequence< TimeFilterPair > SAL_CALL AnimationNode::getTimeFilter() // XAnimate void SAL_CALL AnimationNode::setTimeFilter( const Sequence< TimeFilterPair >& _timefilter ) - throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); maTimeFilter = _timefilter; @@ -1489,14 +1469,14 @@ void SAL_CALL AnimationNode::setTimeFilter( const Sequence< TimeFilterPair >& _t } -OUString SAL_CALL AnimationNode::getFormula() throw (RuntimeException, std::exception) +OUString SAL_CALL AnimationNode::getFormula() { Guard< Mutex > aGuard( maMutex ); return maFormula; } -void SAL_CALL AnimationNode::setFormula( const OUString& _formula ) throw (RuntimeException, std::exception) +void SAL_CALL AnimationNode::setFormula( const OUString& _formula ) { Guard< Mutex > aGuard( maMutex ); if( _formula != maFormula ) @@ -1508,7 +1488,7 @@ void SAL_CALL AnimationNode::setFormula( const OUString& _formula ) throw (Runti // XAnimateColor -sal_Int16 SAL_CALL AnimationNode::getColorInterpolation() throw (RuntimeException, std::exception) +sal_Int16 SAL_CALL AnimationNode::getColorInterpolation() { Guard< Mutex > aGuard( maMutex ); return mnColorSpace; @@ -1516,7 +1496,7 @@ sal_Int16 SAL_CALL AnimationNode::getColorInterpolation() throw (RuntimeExceptio // XAnimateColor -void SAL_CALL AnimationNode::setColorInterpolation( sal_Int16 _colorspace ) throw (RuntimeException, std::exception) +void SAL_CALL AnimationNode::setColorInterpolation( sal_Int16 _colorspace ) { Guard< Mutex > aGuard( maMutex ); if( _colorspace != mnColorSpace ) @@ -1528,7 +1508,7 @@ void SAL_CALL AnimationNode::setColorInterpolation( sal_Int16 _colorspace ) thro // XAnimateColor -sal_Bool SAL_CALL AnimationNode::getDirection() throw (RuntimeException, std::exception) +sal_Bool SAL_CALL AnimationNode::getDirection() { Guard< Mutex > aGuard( maMutex ); return mbDirection; @@ -1536,7 +1516,7 @@ sal_Bool SAL_CALL AnimationNode::getDirection() throw (RuntimeException, std::ex // XAnimateColor -void SAL_CALL AnimationNode::setDirection( sal_Bool _direction ) throw (RuntimeException, std::exception) +void SAL_CALL AnimationNode::setDirection( sal_Bool _direction ) { Guard< Mutex > aGuard( maMutex ); if( bool(_direction) != mbDirection ) @@ -1548,7 +1528,7 @@ void SAL_CALL AnimationNode::setDirection( sal_Bool _direction ) throw (RuntimeE // XAnimateMotion -Any SAL_CALL AnimationNode::getPath() throw (RuntimeException, std::exception) +Any SAL_CALL AnimationNode::getPath() { Guard< Mutex > aGuard( maMutex ); return maPath; @@ -1556,7 +1536,7 @@ Any SAL_CALL AnimationNode::getPath() throw (RuntimeException, std::exception) // XAnimateMotion -void SAL_CALL AnimationNode::setPath( const Any& _path ) throw (RuntimeException, std::exception) +void SAL_CALL AnimationNode::setPath( const Any& _path ) { Guard< Mutex > aGuard( maMutex ); maPath = _path; @@ -1565,7 +1545,7 @@ void SAL_CALL AnimationNode::setPath( const Any& _path ) throw (RuntimeException // XAnimateMotion -Any SAL_CALL AnimationNode::getOrigin() throw (RuntimeException, std::exception) +Any SAL_CALL AnimationNode::getOrigin() { Guard< Mutex > aGuard( maMutex ); return maOrigin; @@ -1573,7 +1553,7 @@ Any SAL_CALL AnimationNode::getOrigin() throw (RuntimeException, std::exception) // XAnimateMotion -void SAL_CALL AnimationNode::setOrigin( const Any& _origin ) throw (RuntimeException, std::exception) +void SAL_CALL AnimationNode::setOrigin( const Any& _origin ) { Guard< Mutex > aGuard( maMutex ); maOrigin = _origin; @@ -1582,7 +1562,7 @@ void SAL_CALL AnimationNode::setOrigin( const Any& _origin ) throw (RuntimeExcep // XAnimateTransform -sal_Int16 SAL_CALL AnimationNode::getTransformType() throw (RuntimeException, std::exception) +sal_Int16 SAL_CALL AnimationNode::getTransformType() { Guard< Mutex > aGuard( maMutex ); return mnTransformType; @@ -1590,7 +1570,7 @@ sal_Int16 SAL_CALL AnimationNode::getTransformType() throw (RuntimeException, st // XAnimateTransform -void SAL_CALL AnimationNode::setTransformType( sal_Int16 _transformtype ) throw (RuntimeException, std::exception) +void SAL_CALL AnimationNode::setTransformType( sal_Int16 _transformtype ) { Guard< Mutex > aGuard( maMutex ); if( _transformtype != mnTransformType ) @@ -1602,7 +1582,7 @@ void SAL_CALL AnimationNode::setTransformType( sal_Int16 _transformtype ) throw // XTransitionFilter -sal_Int16 SAL_CALL AnimationNode::getTransition() throw (RuntimeException, std::exception) +sal_Int16 SAL_CALL AnimationNode::getTransition() { Guard< Mutex > aGuard( maMutex ); return mnTransition; @@ -1610,7 +1590,7 @@ sal_Int16 SAL_CALL AnimationNode::getTransition() throw (RuntimeException, std:: // XTransitionFilter -void SAL_CALL AnimationNode::setTransition( sal_Int16 _transition ) throw (RuntimeException, std::exception) +void SAL_CALL AnimationNode::setTransition( sal_Int16 _transition ) { Guard< Mutex > aGuard( maMutex ); if( _transition != mnTransition ) @@ -1622,7 +1602,7 @@ void SAL_CALL AnimationNode::setTransition( sal_Int16 _transition ) throw (Runti // XTransitionFilter -sal_Int16 SAL_CALL AnimationNode::getSubtype() throw (RuntimeException, std::exception) +sal_Int16 SAL_CALL AnimationNode::getSubtype() { Guard< Mutex > aGuard( maMutex ); return mnSubtype; @@ -1630,7 +1610,7 @@ sal_Int16 SAL_CALL AnimationNode::getSubtype() throw (RuntimeException, std::exc // XTransitionFilter -void SAL_CALL AnimationNode::setSubtype( sal_Int16 _subtype ) throw (RuntimeException, std::exception) +void SAL_CALL AnimationNode::setSubtype( sal_Int16 _subtype ) { Guard< Mutex > aGuard( maMutex ); if( _subtype != mnSubtype ) @@ -1642,7 +1622,7 @@ void SAL_CALL AnimationNode::setSubtype( sal_Int16 _subtype ) throw (RuntimeExce // XTransitionFilter -sal_Bool SAL_CALL AnimationNode::getMode() throw (RuntimeException, std::exception) +sal_Bool SAL_CALL AnimationNode::getMode() { Guard< Mutex > aGuard( maMutex ); return mbMode; @@ -1650,7 +1630,7 @@ sal_Bool SAL_CALL AnimationNode::getMode() throw (RuntimeException, std::excepti // XTransitionFilter -void SAL_CALL AnimationNode::setMode( sal_Bool _mode ) throw (RuntimeException, std::exception) +void SAL_CALL AnimationNode::setMode( sal_Bool _mode ) { Guard< Mutex > aGuard( maMutex ); if( bool(_mode) != mbMode ) @@ -1662,7 +1642,7 @@ void SAL_CALL AnimationNode::setMode( sal_Bool _mode ) throw (RuntimeException, // XTransitionFilter -sal_Int32 SAL_CALL AnimationNode::getFadeColor() throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL AnimationNode::getFadeColor() { Guard< Mutex > aGuard( maMutex ); return mnFadeColor; @@ -1670,7 +1650,7 @@ sal_Int32 SAL_CALL AnimationNode::getFadeColor() throw (RuntimeException, std::e // XTransitionFilter -void SAL_CALL AnimationNode::setFadeColor( sal_Int32 _fadecolor ) throw (RuntimeException, std::exception) +void SAL_CALL AnimationNode::setFadeColor( sal_Int32 _fadecolor ) { Guard< Mutex > aGuard( maMutex ); if( _fadecolor != mnFadeColor ) @@ -1682,7 +1662,7 @@ void SAL_CALL AnimationNode::setFadeColor( sal_Int32 _fadecolor ) throw (Runtime // XAudio -Any SAL_CALL AnimationNode::getSource() throw (RuntimeException, std::exception) +Any SAL_CALL AnimationNode::getSource() { Guard< Mutex > aGuard( maMutex ); return maTarget; @@ -1690,7 +1670,7 @@ Any SAL_CALL AnimationNode::getSource() throw (RuntimeException, std::exception) // XAudio -void SAL_CALL AnimationNode::setSource( const Any& _source ) throw (RuntimeException, std::exception) +void SAL_CALL AnimationNode::setSource( const Any& _source ) { Guard< Mutex > aGuard( maMutex ); maTarget = _source; @@ -1699,7 +1679,7 @@ void SAL_CALL AnimationNode::setSource( const Any& _source ) throw (RuntimeExcep // XAudio -double SAL_CALL AnimationNode::getVolume() throw (RuntimeException, std::exception) +double SAL_CALL AnimationNode::getVolume() { Guard< Mutex > aGuard( maMutex ); return mfVolume; @@ -1707,7 +1687,7 @@ double SAL_CALL AnimationNode::getVolume() throw (RuntimeException, std::excepti // XAudio -void SAL_CALL AnimationNode::setVolume( double _volume ) throw (RuntimeException, std::exception) +void SAL_CALL AnimationNode::setVolume( double _volume ) { Guard< Mutex > aGuard( maMutex ); if( _volume != mfVolume ) @@ -1719,7 +1699,7 @@ void SAL_CALL AnimationNode::setVolume( double _volume ) throw (RuntimeException // XCommand -sal_Int16 SAL_CALL AnimationNode::getCommand() throw (RuntimeException, std::exception) +sal_Int16 SAL_CALL AnimationNode::getCommand() { Guard< Mutex > aGuard( maMutex ); return mnCommand; @@ -1727,7 +1707,7 @@ sal_Int16 SAL_CALL AnimationNode::getCommand() throw (RuntimeException, std::exc // XCommand -void SAL_CALL AnimationNode::setCommand( sal_Int16 _command ) throw (RuntimeException, std::exception) +void SAL_CALL AnimationNode::setCommand( sal_Int16 _command ) { Guard< Mutex > aGuard( maMutex ); if( _command != mnCommand ) @@ -1739,7 +1719,7 @@ void SAL_CALL AnimationNode::setCommand( sal_Int16 _command ) throw (RuntimeExce // XCommand -Any SAL_CALL AnimationNode::getParameter() throw (RuntimeException, std::exception) +Any SAL_CALL AnimationNode::getParameter() { Guard< Mutex > aGuard( maMutex ); return maParameter; @@ -1747,7 +1727,7 @@ Any SAL_CALL AnimationNode::getParameter() throw (RuntimeException, std::excepti // XCommand -void SAL_CALL AnimationNode::setParameter( const Any& _parameter ) throw (RuntimeException, std::exception) +void SAL_CALL AnimationNode::setParameter( const Any& _parameter ) { Guard< Mutex > aGuard( maMutex ); maParameter = _parameter; @@ -1756,14 +1736,14 @@ void SAL_CALL AnimationNode::setParameter( const Any& _parameter ) throw (Runtim // XElementAccess -Type SAL_CALL AnimationNode::getElementType() throw (RuntimeException, std::exception) +Type SAL_CALL AnimationNode::getElementType() { return cppu::UnoType::get(); } // XElementAccess -sal_Bool SAL_CALL AnimationNode::hasElements() throw (RuntimeException, std::exception) +sal_Bool SAL_CALL AnimationNode::hasElements() { Guard< Mutex > aGuard( maMutex ); return !maChildren.empty(); @@ -1772,7 +1752,6 @@ sal_Bool SAL_CALL AnimationNode::hasElements() throw (RuntimeException, std::exc // XEnumerationAccess Reference< XEnumeration > SAL_CALL AnimationNode::createEnumeration() - throw (RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); @@ -1782,7 +1761,6 @@ Reference< XEnumeration > SAL_CALL AnimationNode::createEnumeration() // XTimeContainer Reference< XAnimationNode > SAL_CALL AnimationNode::insertBefore( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild ) - throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); @@ -1807,7 +1785,6 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::insertBefore( const Referenc // XTimeContainer Reference< XAnimationNode > SAL_CALL AnimationNode::insertAfter( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& refChild ) - throw (IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); @@ -1836,7 +1813,6 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::insertAfter( const Reference // XTimeContainer Reference< XAnimationNode > SAL_CALL AnimationNode::replaceChild( const Reference< XAnimationNode >& newChild, const Reference< XAnimationNode >& oldChild ) - throw( IllegalArgumentException, NoSuchElementException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); @@ -1864,7 +1840,6 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::replaceChild( const Referenc // XTimeContainer Reference< XAnimationNode > SAL_CALL AnimationNode::removeChild( const Reference< XAnimationNode >& oldChild ) - throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); @@ -1886,7 +1861,6 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::removeChild( const Reference // XTimeContainer Reference< XAnimationNode > SAL_CALL AnimationNode::appendChild( const Reference< XAnimationNode >& newChild ) - throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) { Guard< Mutex > aGuard( maMutex ); @@ -1911,7 +1885,7 @@ Reference< XAnimationNode > SAL_CALL AnimationNode::appendChild( const Reference // XIterateContainer -sal_Int16 SAL_CALL AnimationNode::getIterateType() throw (RuntimeException, std::exception) +sal_Int16 SAL_CALL AnimationNode::getIterateType() { Guard< Mutex > aGuard( maMutex ); return mnIterateType; @@ -1919,7 +1893,7 @@ sal_Int16 SAL_CALL AnimationNode::getIterateType() throw (RuntimeException, std: // XIterateContainer -void SAL_CALL AnimationNode::setIterateType( sal_Int16 _iteratetype ) throw (RuntimeException, std::exception) +void SAL_CALL AnimationNode::setIterateType( sal_Int16 _iteratetype ) { Guard< Mutex > aGuard( maMutex ); if( _iteratetype != mnIterateType ) @@ -1931,7 +1905,7 @@ void SAL_CALL AnimationNode::setIterateType( sal_Int16 _iteratetype ) throw (Run // XIterateContainer -double SAL_CALL AnimationNode::getIterateInterval() throw (RuntimeException, std::exception) +double SAL_CALL AnimationNode::getIterateInterval() { Guard< Mutex > aGuard( maMutex ); return mfIterateInterval; @@ -1939,7 +1913,7 @@ double SAL_CALL AnimationNode::getIterateInterval() throw (RuntimeException, std // XIterateContainer -void SAL_CALL AnimationNode::setIterateInterval( double _iterateinterval ) throw (RuntimeException, std::exception) +void SAL_CALL AnimationNode::setIterateInterval( double _iterateinterval ) { Guard< Mutex > aGuard( maMutex ); if( _iterateinterval != mfIterateInterval ) @@ -1951,21 +1925,21 @@ void SAL_CALL AnimationNode::setIterateInterval( double _iterateinterval ) throw // XChangesNotifier -void SAL_CALL AnimationNode::addChangesListener( const Reference< XChangesListener >& aListener ) throw (RuntimeException, std::exception) +void SAL_CALL AnimationNode::addChangesListener( const Reference< XChangesListener >& aListener ) { maChangeListener.addInterface( aListener ); } // XChangesNotifier -void SAL_CALL AnimationNode::removeChangesListener( const Reference< XChangesListener >& aListener ) throw (RuntimeException, std::exception) +void SAL_CALL AnimationNode::removeChangesListener( const Reference< XChangesListener >& aListener ) { maChangeListener.removeInterface(aListener); } // XUnoTunnel -::sal_Int64 SAL_CALL AnimationNode::getSomething( const Sequence< ::sal_Int8 >& rId ) throw (RuntimeException, std::exception) +::sal_Int64 SAL_CALL AnimationNode::getSomething( const Sequence< ::sal_Int8 >& rId ) { if( rId.getLength() == 16 && 0 == memcmp( getUnoTunnelId().getConstArray(), rId.getConstArray(), 16 ) ) { diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx index 65a10ba3d3bb..45f1b61132f7 100644 --- a/avmedia/source/framework/soundhandler.cxx +++ b/avmedia/source/framework/soundhandler.cxx @@ -50,7 +50,7 @@ void SAL_CALL SoundHandler::release() throw() OWeakObject::release(); } -css::uno::Any SAL_CALL SoundHandler::queryInterface( const css::uno::Type& aType ) throw( css::uno::RuntimeException, std::exception ) +css::uno::Any SAL_CALL SoundHandler::queryInterface( const css::uno::Type& aType ) { /* Attention: Don't use mutex or guard in this method!!! Is a method of XInterface. */ /* Ask for my own supported interfaces ...*/ @@ -70,12 +70,12 @@ css::uno::Any SAL_CALL SoundHandler::queryInterface( const css::uno::Type& aType return aReturn; } -css::uno::Sequence< sal_Int8 > SAL_CALL SoundHandler::getImplementationId() throw( css::uno::RuntimeException, std::exception ) +css::uno::Sequence< sal_Int8 > SAL_CALL SoundHandler::getImplementationId() { return css::uno::Sequence(); } -css::uno::Sequence< css::uno::Type > SAL_CALL SoundHandler::getTypes() throw( css::uno::RuntimeException, std::exception ) +css::uno::Sequence< css::uno::Type > SAL_CALL SoundHandler::getTypes() { /* Optimize this method ! */ /* We initialize a static variable only one time. */ @@ -111,19 +111,19 @@ css::uno::Sequence< css::uno::Type > SAL_CALL SoundHandler::getTypes() throw( cs /*===========================================================================================================*/ /* XServiceInfo */ /*===========================================================================================================*/ -OUString SAL_CALL SoundHandler::getImplementationName() throw( css::uno::RuntimeException, std::exception ) +OUString SAL_CALL SoundHandler::getImplementationName() { return IMPLEMENTATIONNAME_SOUNDHANDLER; } // XServiceInfo -sal_Bool SAL_CALL SoundHandler::supportsService( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL SoundHandler::supportsService( const OUString& sServiceName ) { return cppu::supportsService(this, sServiceName); } // XServiceInfo -css::uno::Sequence< OUString > SAL_CALL SoundHandler::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) +css::uno::Sequence< OUString > SAL_CALL SoundHandler::getSupportedServiceNames() { return { "com.sun.star.frame.ContentHandler" }; } @@ -185,7 +185,7 @@ SoundHandler::~SoundHandler() *//*-*************************************************************************************************************/ void SAL_CALL SoundHandler::dispatchWithNotification(const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lDescriptor, - const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw(css::uno::RuntimeException, std::exception) + const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) { // SAFE { const ::osl::MutexGuard aLock( m_aLock ); @@ -235,7 +235,7 @@ void SAL_CALL SoundHandler::dispatchWithNotification(const css::util::URL& } void SAL_CALL SoundHandler::dispatch( const css::util::URL& aURL , - const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception ) + const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) { dispatchWithNotification(aURL, lArguments, css::uno::Reference< css::frame::XDispatchResultListener >()); } @@ -261,7 +261,7 @@ void SAL_CALL SoundHandler::dispatch( const css::util::URL& @onerror We return nothing. @threadsafe yes *//*-*************************************************************************************************************/ -OUString SAL_CALL SoundHandler::detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ) +OUString SAL_CALL SoundHandler::detect( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) { // Our default is "nothing". So we can return it, if detection failed or file type is really unknown. OUString sTypeName; diff --git a/avmedia/source/framework/soundhandler.hxx b/avmedia/source/framework/soundhandler.hxx index f055fdf82931..5ee3fc7ae831 100644 --- a/avmedia/source/framework/soundhandler.hxx +++ b/avmedia/source/framework/soundhandler.hxx @@ -77,33 +77,33 @@ class SoundHandler : // interfaces virtual ~SoundHandler( ) override; // XInterface, XTypeProvider, XServiceInfo - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes () throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes () override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; /* interface XServiceInfo */ - virtual OUString SAL_CALL getImplementationName ( ) throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService ( const OUString& sServiceName ) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames ( ) throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName ( ) override; + virtual sal_Bool SAL_CALL supportsService ( const OUString& sServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames ( ) override; // XNotifyingDispatch virtual void SAL_CALL dispatchWithNotification(const css::util::URL& aURL , const css::uno::Sequence< css::beans::PropertyValue >& lArguments, - const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) throw(css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::frame::XDispatchResultListener >& xListener ) override; // XDispatch virtual void SAL_CALL dispatch ( const css::util::URL& aURL , - const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) throw( css::uno::RuntimeException, std::exception ) override; + const css::uno::Sequence< css::beans::PropertyValue >& lArguments ) override; // not supported ! virtual void SAL_CALL addStatusListener ( const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/ , - const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException, std::exception ) override {}; + const css::util::URL& /*aURL*/ ) override {}; virtual void SAL_CALL removeStatusListener ( const css::uno::Reference< css::frame::XStatusListener >& /*xListener*/ , - const css::util::URL& /*aURL*/ ) throw( css::uno::RuntimeException, std::exception ) override {}; + const css::util::URL& /*aURL*/ ) override {}; // XExtendedFilterDetection - virtual OUString SAL_CALL detect ( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL detect ( css::uno::Sequence< css::beans::PropertyValue >& lDescriptor ) override; // protected methods protected: diff --git a/avmedia/source/gstreamer/gstframegrabber.cxx b/avmedia/source/gstreamer/gstframegrabber.cxx index 2ad8cfa09515..db2f20364b68 100644 --- a/avmedia/source/gstreamer/gstframegrabber.cxx +++ b/avmedia/source/gstreamer/gstframegrabber.cxx @@ -105,7 +105,6 @@ FrameGrabber* FrameGrabber::create( const OUString &rURL ) } uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMediaTime ) - throw (uno::RuntimeException, std::exception) { uno::Reference< graphic::XGraphic > xRet; @@ -204,19 +203,16 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe } OUString SAL_CALL FrameGrabber::getImplementationName( ) - throw (uno::RuntimeException, std::exception) { return OUString( AVMEDIA_GST_FRAMEGRABBER_IMPLEMENTATIONNAME ); } sal_Bool SAL_CALL FrameGrabber::supportsService( const OUString& ServiceName ) - throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } uno::Sequence< OUString > SAL_CALL FrameGrabber::getSupportedServiceNames() - throw (uno::RuntimeException, std::exception) { return { AVMEDIA_GST_FRAMEGRABBER_SERVICENAME }; } diff --git a/avmedia/source/gstreamer/gstframegrabber.hxx b/avmedia/source/gstreamer/gstframegrabber.hxx index 51c9d6b39619..2b2f644f8b0f 100644 --- a/avmedia/source/gstreamer/gstframegrabber.hxx +++ b/avmedia/source/gstreamer/gstframegrabber.hxx @@ -45,12 +45,12 @@ public: virtual ~FrameGrabber() override; // XFrameGrabber - virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; private: explicit FrameGrabber( const OUString &aURL ); diff --git a/avmedia/source/gstreamer/gstmanager.cxx b/avmedia/source/gstreamer/gstmanager.cxx index f064cb13a388..aa55134e028f 100644 --- a/avmedia/source/gstreamer/gstmanager.cxx +++ b/avmedia/source/gstreamer/gstmanager.cxx @@ -40,7 +40,6 @@ Manager::~Manager() } uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const OUString& rURL ) - throw (uno::RuntimeException, std::exception) { Player* pPlayer( new Player ); uno::Reference< media::XPlayer > xRet( pPlayer ); @@ -53,19 +52,16 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const OUString& } OUString SAL_CALL Manager::getImplementationName( ) - throw (uno::RuntimeException, std::exception) { return OUString( AVMEDIA_GST_MANAGER_IMPLEMENTATIONNAME ); } sal_Bool SAL_CALL Manager::supportsService( const OUString& ServiceName ) - throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } uno::Sequence< OUString > SAL_CALL Manager::getSupportedServiceNames( ) - throw (uno::RuntimeException, std::exception) { return { AVMEDIA_GST_MANAGER_SERVICENAME }; } diff --git a/avmedia/source/gstreamer/gstmanager.hxx b/avmedia/source/gstreamer/gstmanager.hxx index d415559f41b5..24c057e3d545 100644 --- a/avmedia/source/gstreamer/gstmanager.hxx +++ b/avmedia/source/gstreamer/gstmanager.hxx @@ -35,12 +35,12 @@ public: virtual ~Manager() override; // XManager - virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const OUString& aURL ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const OUString& aURL ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; } // namespace gstreamer diff --git a/avmedia/source/gstreamer/gstplayer.cxx b/avmedia/source/gstreamer/gstplayer.cxx index 37b76626315b..50fa9b4cb1dc 100644 --- a/avmedia/source/gstreamer/gstplayer.cxx +++ b/avmedia/source/gstreamer/gstplayer.cxx @@ -684,7 +684,6 @@ bool Player::create( const OUString& rURL ) void SAL_CALL Player::start() - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -698,7 +697,6 @@ void SAL_CALL Player::start() void SAL_CALL Player::stop() - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -712,7 +710,6 @@ void SAL_CALL Player::stop() sal_Bool SAL_CALL Player::isPlaying() - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -731,7 +728,6 @@ sal_Bool SAL_CALL Player::isPlaying() double SAL_CALL Player::getDuration() - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -747,7 +743,6 @@ double SAL_CALL Player::getDuration() void SAL_CALL Player::setMediaTime( double fTime ) - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -768,7 +763,6 @@ void SAL_CALL Player::setMediaTime( double fTime ) double SAL_CALL Player::getMediaTime() - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -786,7 +780,6 @@ double SAL_CALL Player::getMediaTime() void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet ) - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); // TODO check how to do with GST @@ -795,7 +788,6 @@ void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet ) sal_Bool SAL_CALL Player::isPlaybackLoop() - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); // TODO check how to do with GST @@ -804,7 +796,6 @@ sal_Bool SAL_CALL Player::isPlaybackLoop() void SAL_CALL Player::setMute( sal_Bool bSet ) - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -827,7 +818,6 @@ void SAL_CALL Player::setMute( sal_Bool bSet ) sal_Bool SAL_CALL Player::isMute() - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -836,7 +826,6 @@ sal_Bool SAL_CALL Player::isMute() void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB ) - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -853,7 +842,6 @@ void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB ) sal_Int16 SAL_CALL Player::getVolumeDB() - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -872,7 +860,6 @@ sal_Int16 SAL_CALL Player::getVolumeDB() awt::Size SAL_CALL Player::getPreferredPlayerWindowSize() - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -900,7 +887,6 @@ awt::Size SAL_CALL Player::getPreferredPlayerWindowSize() uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( const uno::Sequence< uno::Any >& rArguments ) - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -962,7 +948,6 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber() - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); FrameGrabber* pFrameGrabber = nullptr; @@ -977,21 +962,18 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber() OUString SAL_CALL Player::getImplementationName() - throw (uno::RuntimeException, std::exception) { return OUString( AVMEDIA_GST_PLAYER_IMPLEMENTATIONNAME ); } sal_Bool SAL_CALL Player::supportsService( const OUString& ServiceName ) - throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } uno::Sequence< OUString > SAL_CALL Player::getSupportedServiceNames() - throw (uno::RuntimeException, std::exception) { return { AVMEDIA_GST_PLAYER_SERVICENAME }; } diff --git a/avmedia/source/gstreamer/gstplayer.hxx b/avmedia/source/gstreamer/gstplayer.hxx index 3a61eba88625..61dc3c14cc58 100644 --- a/avmedia/source/gstreamer/gstplayer.hxx +++ b/avmedia/source/gstreamer/gstplayer.hxx @@ -53,26 +53,26 @@ public: GstBusSyncReply processSyncMessage( GstMessage *message ); // XPlayer - virtual void SAL_CALL start( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL stop( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isPlaying( ) throw (css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getDuration( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMediaTime( double fTime ) throw (css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getMediaTime( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isPlaybackLoop( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMute( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isMute( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getVolumeDB( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Size SAL_CALL getPreferredPlayerWindowSize( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL start( ) override; + virtual void SAL_CALL stop( ) override; + virtual sal_Bool SAL_CALL isPlaying( ) override; + virtual double SAL_CALL getDuration( ) override; + virtual void SAL_CALL setMediaTime( double fTime ) override; + virtual double SAL_CALL getMediaTime( ) override; + virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) override; + virtual sal_Bool SAL_CALL isPlaybackLoop( ) override; + virtual void SAL_CALL setMute( sal_Bool bSet ) override; + virtual sal_Bool SAL_CALL isMute( ) override; + virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) override; + virtual sal_Int16 SAL_CALL getVolumeDB( ) override; + virtual css::awt::Size SAL_CALL getPreferredPlayerWindowSize( ) override; + virtual css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments ) override; + virtual css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber( ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // ::cppu::OComponentHelper virtual void SAL_CALL disposing() final override; diff --git a/avmedia/source/gstreamer/gstwindow.cxx b/avmedia/source/gstreamer/gstwindow.cxx index 3b061f3915de..948fff012d0c 100644 --- a/avmedia/source/gstreamer/gstwindow.cxx +++ b/avmedia/source/gstreamer/gstwindow.cxx @@ -67,12 +67,10 @@ Window::~Window() void SAL_CALL Window::update( ) - throw (uno::RuntimeException, std::exception) { } sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel eZoomLevel ) - throw (uno::RuntimeException, std::exception) { bool bRet = false; @@ -91,13 +89,11 @@ sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel eZoomLevel ) } media::ZoomLevel SAL_CALL Window::getZoomLevel( ) - throw (uno::RuntimeException, std::exception) { return meZoomLevel; } void SAL_CALL Window::setPointerType( sal_Int32 nPointerType ) - throw (uno::RuntimeException, std::exception) { mnPointerType = nPointerType; } @@ -106,12 +102,10 @@ void SAL_CALL Window::setPointerType( sal_Int32 nPointerType ) void SAL_CALL Window::setPosSize( sal_Int32 /*X*/, sal_Int32 /*Y*/, sal_Int32 /*Width*/, sal_Int32 /*Height*/, sal_Int16 /*Flags*/ ) - throw (uno::RuntimeException, std::exception) { } awt::Rectangle SAL_CALL Window::getPosSize() - throw (uno::RuntimeException, std::exception) { awt::Rectangle aRet; @@ -123,77 +117,62 @@ awt::Rectangle SAL_CALL Window::getPosSize() } void SAL_CALL Window::setVisible( sal_Bool /*bVisible*/ ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::setEnable( sal_Bool /*bEnable*/ ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::setFocus( ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::addWindowListener( const uno::Reference< awt::XWindowListener >& ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::removeWindowListener( const uno::Reference< awt::XWindowListener >& ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::addFocusListener( const uno::Reference< awt::XFocusListener >& ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::removeFocusListener( const uno::Reference< awt::XFocusListener >& ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::addKeyListener( const uno::Reference< awt::XKeyListener >& ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::removeKeyListener( const uno::Reference< awt::XKeyListener >& ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::addMouseListener( const uno::Reference< awt::XMouseListener >& ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::removeMouseListener( const uno::Reference< awt::XMouseListener >& ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::addPaintListener( const uno::Reference< awt::XPaintListener >& ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintListener >& ) - throw (uno::RuntimeException, std::exception) { } @@ -201,17 +180,14 @@ void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintList void SAL_CALL Window::dispose( ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::addEventListener( const uno::Reference< lang::XEventListener >& ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventListener >& ) - throw (uno::RuntimeException, std::exception) { } @@ -219,19 +195,16 @@ void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventLis OUString SAL_CALL Window::getImplementationName( ) - throw (uno::RuntimeException, std::exception) { return OUString( AVMEDIA_GST_WINDOW_IMPLEMENTATIONNAME ); } sal_Bool SAL_CALL Window::supportsService( const OUString& ServiceName ) - throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } uno::Sequence< OUString > SAL_CALL Window::getSupportedServiceNames( ) - throw (uno::RuntimeException, std::exception) { return { AVMEDIA_GST_WINDOW_SERVICENAME }; } diff --git a/avmedia/source/gstreamer/gstwindow.hxx b/avmedia/source/gstreamer/gstwindow.hxx index da090a8df1f0..3b8f431d767a 100644 --- a/avmedia/source/gstreamer/gstwindow.hxx +++ b/avmedia/source/gstreamer/gstwindow.hxx @@ -39,39 +39,39 @@ public: virtual ~Window() override; // XPlayerWindow - virtual void SAL_CALL update( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::media::ZoomLevel SAL_CALL getZoomLevel( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL update( ) override; + virtual sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) override; + virtual css::media::ZoomLevel SAL_CALL getZoomLevel( ) override; + virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) override; // XWindow - virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Rectangle SAL_CALL getPosSize( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setVisible( sal_Bool Visible ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setEnable( sal_Bool Enable ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFocus( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) override; + virtual css::awt::Rectangle SAL_CALL getPosSize( ) override; + virtual void SAL_CALL setVisible( sal_Bool Visible ) override; + virtual void SAL_CALL setEnable( sal_Bool Enable ) override; + virtual void SAL_CALL setFocus( ) override; + virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override; + virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override; + virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override; + virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override; + virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override; + virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override; + virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override; + virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override; + virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override; + virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override; + virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override; + virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override; // XComponent - virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose( ) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; private: diff --git a/avmedia/source/macavf/framegrabber.hxx b/avmedia/source/macavf/framegrabber.hxx index 4567690e0c75..7f4681ef4364 100644 --- a/avmedia/source/macavf/framegrabber.hxx +++ b/avmedia/source/macavf/framegrabber.hxx @@ -39,12 +39,12 @@ public: bool create( AVAsset* pMovie ); // XFrameGrabber - virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw (css::uno::RuntimeException) override; + virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) override; // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (css::uno::RuntimeException) override; - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) override; + virtual ::rtl::OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) override; + virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) override; private: diff --git a/avmedia/source/macavf/framegrabber.mm b/avmedia/source/macavf/framegrabber.mm index b4022caf360e..2293a05ba03a 100644 --- a/avmedia/source/macavf/framegrabber.mm +++ b/avmedia/source/macavf/framegrabber.mm @@ -74,7 +74,6 @@ bool FrameGrabber::create( AVAsset* pMovie ) uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMediaTime ) - throw (uno::RuntimeException) { uno::Reference< graphic::XGraphic > xRet; if( !mpImageGen ) @@ -105,19 +104,16 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe ::rtl::OUString SAL_CALL FrameGrabber::getImplementationName( ) - throw (uno::RuntimeException) { return ::rtl::OUString( AVMEDIA_MACAVF_FRAMEGRABBER_IMPLEMENTATIONNAME ); } sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString& ServiceName ) - throw (uno::RuntimeException) { return ServiceName == AVMEDIA_MACAVF_FRAMEGRABBER_SERVICENAME; } uno::Sequence< ::rtl::OUString > SAL_CALL FrameGrabber::getSupportedServiceNames( ) - throw (uno::RuntimeException) { return { AVMEDIA_MACAVF_FRAMEGRABBER_SERVICENAME }; } diff --git a/avmedia/source/macavf/manager.hxx b/avmedia/source/macavf/manager.hxx index 6044df008d37..7761cc7d91e9 100644 --- a/avmedia/source/macavf/manager.hxx +++ b/avmedia/source/macavf/manager.hxx @@ -37,12 +37,12 @@ public: virtual ~Manager() override; // XManager - virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const ::rtl::OUString& aURL ) throw (css::uno::RuntimeException) override; + virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const ::rtl::OUString& aURL ) override; // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (css::uno::RuntimeException) override; - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) override; + virtual ::rtl::OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) override; + virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) override; private: css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr; diff --git a/avmedia/source/macavf/manager.mm b/avmedia/source/macavf/manager.mm index 5df4af80c37b..69d2a3c0196f 100644 --- a/avmedia/source/macavf/manager.mm +++ b/avmedia/source/macavf/manager.mm @@ -37,7 +37,6 @@ Manager::~Manager() uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OUString& rURL ) - throw (uno::RuntimeException) { Player* pPlayer( new Player( mxMgr ) ); uno::Reference< media::XPlayer > xRet( pPlayer ); @@ -51,21 +50,18 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OU ::rtl::OUString SAL_CALL Manager::getImplementationName( ) - throw (uno::RuntimeException) { return ::rtl::OUString( AVMEDIA_MACAVF_MANAGER_IMPLEMENTATIONNAME ); } sal_Bool SAL_CALL Manager::supportsService( const ::rtl::OUString& ServiceName ) - throw (uno::RuntimeException) { return ServiceName == AVMEDIA_MACAVF_MANAGER_SERVICENAME; } uno::Sequence< ::rtl::OUString > SAL_CALL Manager::getSupportedServiceNames( ) - throw (uno::RuntimeException) { return { AVMEDIA_MACAVF_MANAGER_SERVICENAME }; } diff --git a/avmedia/source/macavf/player.hxx b/avmedia/source/macavf/player.hxx index b02400bba898..176f6f502cea 100644 --- a/avmedia/source/macavf/player.hxx +++ b/avmedia/source/macavf/player.hxx @@ -41,29 +41,29 @@ public: bool create( AVAsset* ); // XPlayer - virtual void SAL_CALL start() throw (css::uno::RuntimeException) override; - virtual void SAL_CALL stop() throw (css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isPlaying() throw (css::uno::RuntimeException) override; - virtual double SAL_CALL getDuration() throw (css::uno::RuntimeException) override; - virtual void SAL_CALL setMediaTime( double fTime ) throw (css::uno::RuntimeException) override; - virtual double SAL_CALL getMediaTime() throw (css::uno::RuntimeException) override; + virtual void SAL_CALL start() override; + virtual void SAL_CALL stop() override; + virtual sal_Bool SAL_CALL isPlaying() override; + virtual double SAL_CALL getDuration() override; + virtual void SAL_CALL setMediaTime( double fTime ) override; + virtual double SAL_CALL getMediaTime() override; /// @throws css::uno::RuntimeException - virtual void SAL_CALL setStopTime( double fTime ) throw (css::uno::RuntimeException); + virtual void SAL_CALL setStopTime( double fTime ); /// @throws css::uno::RuntimeException - virtual double SAL_CALL getStopTime() throw (css::uno::RuntimeException); - virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isPlaybackLoop() throw (css::uno::RuntimeException) override; - virtual void SAL_CALL setMute( sal_Bool bSet ) throw (css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isMute() throw (css::uno::RuntimeException) override; - virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (css::uno::RuntimeException) override; - virtual sal_Int16 SAL_CALL getVolumeDB() throw (css::uno::RuntimeException) override; - virtual css::awt::Size SAL_CALL getPreferredPlayerWindowSize( ) throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber( ) throw (css::uno::RuntimeException) override; + virtual double SAL_CALL getStopTime(); + virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) override; + virtual sal_Bool SAL_CALL isPlaybackLoop() override; + virtual void SAL_CALL setMute( sal_Bool bSet ) override; + virtual sal_Bool SAL_CALL isMute() override; + virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) override; + virtual sal_Int16 SAL_CALL getVolumeDB() override; + virtual css::awt::Size SAL_CALL getPreferredPlayerWindowSize( ) override; + virtual css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments ) override; + virtual css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber( ) override; // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (css::uno::RuntimeException) override; - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) override; + virtual ::rtl::OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) override; + virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) override; AVPlayer* getAVPlayer() const { return mpPlayer; } virtual bool handleObservation( NSString* pKeyPath ) override; diff --git a/avmedia/source/macavf/player.mm b/avmedia/source/macavf/player.mm index bd63acaf4b43..a683b4790032 100644 --- a/avmedia/source/macavf/player.mm +++ b/avmedia/source/macavf/player.mm @@ -154,7 +154,6 @@ bool Player::create( const ::rtl::OUString& rURL ) void SAL_CALL Player::start() - throw (uno::RuntimeException) { if( !mpPlayer ) return; @@ -165,7 +164,6 @@ void SAL_CALL Player::start() void SAL_CALL Player::stop() - throw (uno::RuntimeException) { if( !mpPlayer ) return; @@ -176,7 +174,6 @@ void SAL_CALL Player::stop() sal_Bool SAL_CALL Player::isPlaying() - throw (uno::RuntimeException) { if( !mpPlayer ) return false; @@ -186,7 +183,6 @@ sal_Bool SAL_CALL Player::isPlaying() double SAL_CALL Player::getDuration() - throw (uno::RuntimeException) { // slideshow checks for non-zero duration, so cheat here double duration = 0.01; @@ -205,7 +201,6 @@ double SAL_CALL Player::getDuration() void SAL_CALL Player::setMediaTime( double fTime ) - throw (uno::RuntimeException) { if( mpPlayer ) [mpPlayer seekToTime: CMTimeMakeWithSeconds(fTime,1000) ]; @@ -213,7 +208,6 @@ void SAL_CALL Player::setMediaTime( double fTime ) double SAL_CALL Player::getMediaTime() - throw (uno::RuntimeException) { if( !mpPlayer ) return 0.0; @@ -228,35 +222,30 @@ double SAL_CALL Player::getMediaTime() void SAL_CALL Player::setStopTime( double fTime ) - throw (uno::RuntimeException) { mfStopTime = fTime; } double SAL_CALL Player::getStopTime() - throw (uno::RuntimeException) { return mfStopTime; } void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet ) - throw (uno::RuntimeException) { mbLooping = bSet; } sal_Bool SAL_CALL Player::isPlaybackLoop() - throw (uno::RuntimeException) { return mbLooping; } void SAL_CALL Player::setMute( sal_Bool bSet ) - throw (uno::RuntimeException) { if( !mpPlayer ) return; @@ -267,14 +256,12 @@ void SAL_CALL Player::setMute( sal_Bool bSet ) sal_Bool SAL_CALL Player::isMute() - throw (uno::RuntimeException) { return mbMuted; } void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB ) - throw (uno::RuntimeException) { // -40dB <-> AVPlayer volume 0.0 // 0dB <-> AVPlayer volume 1.0 @@ -287,7 +274,6 @@ void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB ) sal_Int16 SAL_CALL Player::getVolumeDB() - throw (uno::RuntimeException) { if( !mpPlayer ) return 0; @@ -305,7 +291,6 @@ sal_Int16 SAL_CALL Player::getVolumeDB() awt::Size SAL_CALL Player::getPreferredPlayerWindowSize() - throw (uno::RuntimeException) { awt::Size aSize( 0, 0 ); // default size @@ -323,7 +308,6 @@ awt::Size SAL_CALL Player::getPreferredPlayerWindowSize() uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( const uno::Sequence< uno::Any >& aArguments ) - throw (uno::RuntimeException) { // get the preferred window size const awt::Size aSize( getPreferredPlayerWindowSize() ); @@ -346,7 +330,6 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber() - throw (uno::RuntimeException) { uno::Reference< media::XFrameGrabber > xRet; @@ -360,21 +343,18 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber() ::rtl::OUString SAL_CALL Player::getImplementationName( ) - throw (uno::RuntimeException) { return ::rtl::OUString( AVMEDIA_MACAVF_PLAYER_IMPLEMENTATIONNAME ); } sal_Bool SAL_CALL Player::supportsService( const ::rtl::OUString& ServiceName ) - throw (uno::RuntimeException) { return ServiceName == AVMEDIA_MACAVF_PLAYER_SERVICENAME; } uno::Sequence< ::rtl::OUString > SAL_CALL Player::getSupportedServiceNames( ) - throw (uno::RuntimeException) { return { AVMEDIA_MACAVF_PLAYER_SERVICENAME }; } diff --git a/avmedia/source/macavf/window.hxx b/avmedia/source/macavf/window.hxx index fc9387e0bc2d..54c9038ced3a 100644 --- a/avmedia/source/macavf/window.hxx +++ b/avmedia/source/macavf/window.hxx @@ -55,39 +55,39 @@ public: void updatePointer(); // XPlayerWindow - virtual void SAL_CALL update( ) throw (css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) throw (css::uno::RuntimeException) override; - virtual css::media::ZoomLevel SAL_CALL getZoomLevel( ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) throw (css::uno::RuntimeException) override; + virtual void SAL_CALL update( ) override; + virtual sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) override; + virtual css::media::ZoomLevel SAL_CALL getZoomLevel( ) override; + virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) override; // XWindow - virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (css::uno::RuntimeException) override; - virtual css::awt::Rectangle SAL_CALL getPosSize( ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL setVisible( sal_Bool Visible ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL setEnable( sal_Bool Enable ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL setFocus( ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException) override; + virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) override; + virtual css::awt::Rectangle SAL_CALL getPosSize( ) override; + virtual void SAL_CALL setVisible( sal_Bool Visible ) override; + virtual void SAL_CALL setEnable( sal_Bool Enable ) override; + virtual void SAL_CALL setFocus( ) override; + virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override; + virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override; + virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override; + virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override; + virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override; + virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override; + virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override; + virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override; + virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override; + virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override; + virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override; + virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override; // XComponent - virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException) override; + virtual void SAL_CALL dispose( ) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (css::uno::RuntimeException) override; - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) override; + virtual ::rtl::OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) override; + virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) override; virtual bool handleObservation( NSString* pKeyPath ) override; diff --git a/avmedia/source/macavf/window.mm b/avmedia/source/macavf/window.mm index b1c64d8088ce..6807aadbfb2e 100644 --- a/avmedia/source/macavf/window.mm +++ b/avmedia/source/macavf/window.mm @@ -83,26 +83,22 @@ bool Window::handleObservation( NSString* /*pKeyPath*/ ) // XPlayerWindow void SAL_CALL Window::update() - throw (uno::RuntimeException) {} sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel /* eZoomLevel */ ) - throw (uno::RuntimeException) { return false; } media::ZoomLevel SAL_CALL Window::getZoomLevel( ) - throw (uno::RuntimeException) { return meZoomLevel; } void SAL_CALL Window::setPointerType( sal_Int32 nPointerType ) - throw (uno::RuntimeException) { mnPointerType = nPointerType; } @@ -110,7 +106,6 @@ void SAL_CALL Window::setPointerType( sal_Int32 nPointerType ) // XWindow void SAL_CALL Window::setPosSize( sal_Int32 /*X*/, sal_Int32 /*Y*/, sal_Int32 Width, sal_Int32 Height, sal_Int16 /* Flags */ ) - throw (uno::RuntimeException) { if( !mpView ) return; @@ -127,7 +122,6 @@ void SAL_CALL Window::setPosSize( sal_Int32 /*X*/, sal_Int32 /*Y*/, sal_Int32 Wi awt::Rectangle SAL_CALL Window::getPosSize() - throw (uno::RuntimeException) { awt::Rectangle aRet; @@ -141,102 +135,87 @@ awt::Rectangle SAL_CALL Window::getPosSize() void SAL_CALL Window::setVisible( sal_Bool /*bVisible*/ ) - throw (uno::RuntimeException) { } void SAL_CALL Window::setEnable( sal_Bool /*bEnable*/ ) - throw (uno::RuntimeException) { } void SAL_CALL Window::setFocus() - throw (uno::RuntimeException) { } void SAL_CALL Window::addWindowListener( const uno::Reference< awt::XWindowListener >& xListener ) - throw (uno::RuntimeException) { maListeners.addInterface( cppu::UnoType::get(), xListener ); } void SAL_CALL Window::removeWindowListener( const uno::Reference< awt::XWindowListener >& xListener ) - throw (uno::RuntimeException) { maListeners.removeInterface( cppu::UnoType::get(), xListener ); } void SAL_CALL Window::addFocusListener( const uno::Reference< awt::XFocusListener >& xListener ) - throw (uno::RuntimeException) { maListeners.addInterface( cppu::UnoType::get(), xListener ); } void SAL_CALL Window::removeFocusListener( const uno::Reference< awt::XFocusListener >& xListener ) - throw (uno::RuntimeException) { maListeners.removeInterface( cppu::UnoType::get(), xListener ); } void SAL_CALL Window::addKeyListener( const uno::Reference< awt::XKeyListener >& xListener ) - throw (uno::RuntimeException) { maListeners.addInterface( cppu::UnoType::get(), xListener ); } void SAL_CALL Window::removeKeyListener( const uno::Reference< awt::XKeyListener >& xListener ) - throw (uno::RuntimeException) { maListeners.removeInterface( cppu::UnoType::get(), xListener ); } void SAL_CALL Window::addMouseListener( const uno::Reference< awt::XMouseListener >& xListener ) - throw (uno::RuntimeException) { maListeners.addInterface( cppu::UnoType::get(), xListener ); } void SAL_CALL Window::removeMouseListener( const uno::Reference< awt::XMouseListener >& xListener ) - throw (uno::RuntimeException) { maListeners.removeInterface( cppu::UnoType::get(), xListener ); } void SAL_CALL Window::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener ) - throw (uno::RuntimeException) { maListeners.addInterface( cppu::UnoType::get(), xListener ); } void SAL_CALL Window::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener ) - throw (uno::RuntimeException) { maListeners.removeInterface( cppu::UnoType::get(), xListener ); } void SAL_CALL Window::addPaintListener( const uno::Reference< awt::XPaintListener >& xListener ) - throw (uno::RuntimeException) { maListeners.addInterface( cppu::UnoType::get(), xListener ); } void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintListener >& xListener ) - throw (uno::RuntimeException) { maListeners.removeInterface( cppu::UnoType::get(), xListener ); } @@ -245,20 +224,17 @@ void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintList // XComponent void SAL_CALL Window::dispose( ) - throw (uno::RuntimeException) { } void SAL_CALL Window::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException) { maListeners.addInterface( cppu::UnoType::get(), xListener ); } void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException) { maListeners.removeInterface( cppu::UnoType::get(), xListener ); } @@ -266,21 +242,18 @@ void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventLis // XServiceInfo ::rtl::OUString SAL_CALL Window::getImplementationName( ) - throw (uno::RuntimeException) { return ::rtl::OUString( AVMEDIA_MACAVF_WINDOW_IMPLEMENTATIONNAME ); } sal_Bool SAL_CALL Window::supportsService( const ::rtl::OUString& ServiceName ) - throw (uno::RuntimeException) { return ServiceName == AVMEDIA_MACAVF_WINDOW_SERVICENAME; } uno::Sequence< ::rtl::OUString > SAL_CALL Window::getSupportedServiceNames( ) - throw (uno::RuntimeException) { return { AVMEDIA_MACAVF_WINDOW_SERVICENAME }; } diff --git a/avmedia/source/opengl/oglframegrabber.cxx b/avmedia/source/opengl/oglframegrabber.cxx index 9cb7ddd31416..52fa7a4da83a 100644 --- a/avmedia/source/opengl/oglframegrabber.cxx +++ b/avmedia/source/opengl/oglframegrabber.cxx @@ -35,7 +35,6 @@ OGLFrameGrabber::~OGLFrameGrabber() } uno::Reference< css::graphic::XGraphic > SAL_CALL OGLFrameGrabber::grabFrame( double /*fMediaTime*/ ) - throw ( uno::RuntimeException, std::exception ) { std::unique_ptr pBuffer(new sal_uInt8[m_rHandle.viewport.width * m_rHandle.viewport.height * 4]); glTFHandle* pHandle = &m_rHandle; @@ -49,19 +48,17 @@ uno::Reference< css::graphic::XGraphic > SAL_CALL OGLFrameGrabber::grabFrame( do return Graphic( aBitmap ).GetXGraphic(); } -OUString SAL_CALL OGLFrameGrabber::getImplementationName() throw ( uno::RuntimeException, std::exception ) +OUString SAL_CALL OGLFrameGrabber::getImplementationName() { return OUString("com.sun.star.comp.avmedia.FrameGrabber_OpenGL"); } sal_Bool SAL_CALL OGLFrameGrabber::supportsService( const OUString& rServiceName ) - throw ( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } uno::Sequence< OUString > SAL_CALL OGLFrameGrabber::getSupportedServiceNames() - throw ( uno::RuntimeException, std::exception ) { return { "com.sun.star.media.FrameGrabber_OpenGL" }; } diff --git a/avmedia/source/opengl/oglframegrabber.hxx b/avmedia/source/opengl/oglframegrabber.hxx index 1c3799f616de..fd2c52865d48 100644 --- a/avmedia/source/opengl/oglframegrabber.hxx +++ b/avmedia/source/opengl/oglframegrabber.hxx @@ -29,12 +29,12 @@ public: virtual ~OGLFrameGrabber() override; // XFrameGrabber - virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; private: libgltf::glTFHandle& m_rHandle; diff --git a/avmedia/source/opengl/oglmanager.cxx b/avmedia/source/opengl/oglmanager.cxx index 0e538373fc5a..0f7cfddc77d4 100644 --- a/avmedia/source/opengl/oglmanager.cxx +++ b/avmedia/source/opengl/oglmanager.cxx @@ -26,7 +26,6 @@ OGLManager::~OGLManager() } uno::Reference< media::XPlayer > SAL_CALL OGLManager::createPlayer( const OUString& rURL ) - throw (uno::RuntimeException, std::exception) { OGLPlayer* pPlayer( new OGLPlayer() ); if( pPlayer->create(rURL) ) @@ -39,19 +38,17 @@ uno::Reference< media::XPlayer > SAL_CALL OGLManager::createPlayer( const OUStri } } -OUString SAL_CALL OGLManager::getImplementationName() throw ( uno::RuntimeException, std::exception ) +OUString SAL_CALL OGLManager::getImplementationName() { return OUString("com.sun.star.comp.avmedia.Manager_OpenGL"); } sal_Bool SAL_CALL OGLManager::supportsService( const OUString& rServiceName ) - throw ( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } uno::Sequence< OUString > SAL_CALL OGLManager::getSupportedServiceNames() - throw ( uno::RuntimeException, std::exception ) { return { "com.sun.star.media.Manager_OpenGL" }; } diff --git a/avmedia/source/opengl/oglmanager.hxx b/avmedia/source/opengl/oglmanager.hxx index d6f147304e12..945139f2313a 100644 --- a/avmedia/source/opengl/oglmanager.hxx +++ b/avmedia/source/opengl/oglmanager.hxx @@ -25,12 +25,12 @@ public: virtual ~OGLManager() override; // XManager - virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const OUString& rURL ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const OUString& rURL ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; private: }; diff --git a/avmedia/source/opengl/oglplayer.cxx b/avmedia/source/opengl/oglplayer.cxx index 4c5eba196713..18b4e9437d66 100644 --- a/avmedia/source/opengl/oglplayer.cxx +++ b/avmedia/source/opengl/oglplayer.cxx @@ -139,7 +139,7 @@ void OGLPlayer::releaseInputFiles() m_vInputFiles.clear(); } -void SAL_CALL OGLPlayer::start() throw ( uno::RuntimeException, std::exception ) +void SAL_CALL OGLPlayer::start() { osl::MutexGuard aGuard(m_aMutex); assert(m_pHandle); @@ -152,7 +152,7 @@ void SAL_CALL OGLPlayer::start() throw ( uno::RuntimeException, std::exception ) m_bIsRendering = true; } -void SAL_CALL OGLPlayer::stop() throw ( uno::RuntimeException, std::exception ) +void SAL_CALL OGLPlayer::stop() { osl::MutexGuard aGuard(m_aMutex); assert(m_pHandle); @@ -161,7 +161,7 @@ void SAL_CALL OGLPlayer::stop() throw ( uno::RuntimeException, std::exception ) m_bIsRendering = false; } -sal_Bool SAL_CALL OGLPlayer::isPlaying() throw ( uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL OGLPlayer::isPlaying() { osl::MutexGuard aGuard(m_aMutex); assert(m_pHandle); @@ -173,64 +173,64 @@ sal_Bool SAL_CALL OGLPlayer::isPlaying() throw ( uno::RuntimeException, std::exc return m_bIsRendering; } -double SAL_CALL OGLPlayer::getDuration() throw ( uno::RuntimeException, std::exception ) +double SAL_CALL OGLPlayer::getDuration() { osl::MutexGuard aGuard(m_aMutex); assert(m_pHandle); return gltf_animation_get_duration(m_pHandle); } -void SAL_CALL OGLPlayer::setMediaTime( double fTime ) throw ( uno::RuntimeException, std::exception ) +void SAL_CALL OGLPlayer::setMediaTime( double fTime ) { osl::MutexGuard aGuard(m_aMutex); assert(m_pHandle); gltf_animation_set_time(m_pHandle, fTime); } -double SAL_CALL OGLPlayer::getMediaTime() throw ( css::uno::RuntimeException, std::exception ) +double SAL_CALL OGLPlayer::getMediaTime() { osl::MutexGuard aGuard(m_aMutex); assert(m_pHandle); return gltf_animation_get_time(m_pHandle); } -void SAL_CALL OGLPlayer::setPlaybackLoop( sal_Bool bSet ) throw ( uno::RuntimeException, std::exception ) +void SAL_CALL OGLPlayer::setPlaybackLoop( sal_Bool bSet ) { osl::MutexGuard aGuard(m_aMutex); assert(m_pHandle); gltf_animation_set_looping(m_pHandle, bSet); } -sal_Bool SAL_CALL OGLPlayer::isPlaybackLoop() throw ( uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL OGLPlayer::isPlaybackLoop() { osl::MutexGuard aGuard(m_aMutex); assert(m_pHandle); return gltf_animation_get_looping(m_pHandle); } -void SAL_CALL OGLPlayer::setVolumeDB( sal_Int16 /*nVolumDB*/ ) throw ( uno::RuntimeException, std::exception ) +void SAL_CALL OGLPlayer::setVolumeDB( sal_Int16 /*nVolumDB*/ ) { // OpenGL models have no sound. } -sal_Int16 SAL_CALL OGLPlayer::getVolumeDB() throw ( uno::RuntimeException, std::exception ) +sal_Int16 SAL_CALL OGLPlayer::getVolumeDB() { // OpenGL models have no sound. return 0; } -void SAL_CALL OGLPlayer::setMute( sal_Bool /*bSet*/ ) throw ( uno::RuntimeException, std::exception ) +void SAL_CALL OGLPlayer::setMute( sal_Bool /*bSet*/ ) { // OpenGL models have no sound. } -sal_Bool SAL_CALL OGLPlayer::isMute() throw ( uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL OGLPlayer::isMute() { // OpenGL models have no sound. return false; } -awt::Size SAL_CALL OGLPlayer::getPreferredPlayerWindowSize() throw ( uno::RuntimeException, std::exception ) +awt::Size SAL_CALL OGLPlayer::getPreferredPlayerWindowSize() { return awt::Size( 480, 360 ); } @@ -241,7 +241,6 @@ static bool lcl_CheckOpenGLRequirements() } uno::Reference< media::XPlayerWindow > SAL_CALL OGLPlayer::createPlayerWindow( const uno::Sequence< uno::Any >& rArguments ) - throw ( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard( m_aMutex ); @@ -300,7 +299,6 @@ uno::Reference< media::XPlayerWindow > SAL_CALL OGLPlayer::createPlayerWindow( c } uno::Reference< media::XFrameGrabber > SAL_CALL OGLPlayer::createFrameGrabber() - throw ( uno::RuntimeException, std::exception ) { osl::MutexGuard aGuard(m_aMutex); assert(m_pHandle); @@ -341,19 +339,16 @@ uno::Reference< media::XFrameGrabber > SAL_CALL OGLPlayer::createFrameGrabber() } OUString SAL_CALL OGLPlayer::getImplementationName() - throw ( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.avmedia.Player_OpenGL"); } sal_Bool SAL_CALL OGLPlayer::supportsService( const OUString& rServiceName ) - throw ( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } uno::Sequence< OUString > SAL_CALL OGLPlayer::getSupportedServiceNames() - throw ( uno::RuntimeException, std::exception ) { return { "com.sun.star.media.Player_OpenGL" }; } diff --git a/avmedia/source/opengl/oglplayer.hxx b/avmedia/source/opengl/oglplayer.hxx index 05716ad33b5f..a74aae4707f9 100644 --- a/avmedia/source/opengl/oglplayer.hxx +++ b/avmedia/source/opengl/oglplayer.hxx @@ -40,25 +40,25 @@ public: void releaseInputFiles(); // XPlayer - virtual void SAL_CALL start() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL stop() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isPlaying() throw (css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getDuration() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMediaTime( double fTime ) throw (css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getMediaTime() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isPlaybackLoop() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getVolumeDB() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setMute( sal_Bool bSet ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isMute() throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Size SAL_CALL getPreferredPlayerWindowSize() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& rArguments ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL start() override; + virtual void SAL_CALL stop() override; + virtual sal_Bool SAL_CALL isPlaying() override; + virtual double SAL_CALL getDuration() override; + virtual void SAL_CALL setMediaTime( double fTime ) override; + virtual double SAL_CALL getMediaTime() override; + virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) override; + virtual sal_Bool SAL_CALL isPlaybackLoop() override; + virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) override; + virtual sal_Int16 SAL_CALL getVolumeDB() override; + virtual void SAL_CALL setMute( sal_Bool bSet ) override; + virtual sal_Bool SAL_CALL isMute() override; + virtual css::awt::Size SAL_CALL getPreferredPlayerWindowSize() override; + virtual css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& rArguments ) override; + virtual css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; private: DECL_LINK( TimerHandler, Timer*, void ); diff --git a/avmedia/source/opengl/oglwindow.cxx b/avmedia/source/opengl/oglwindow.cxx index 88209d55ee5c..fe0adab71a20 100644 --- a/avmedia/source/opengl/oglwindow.cxx +++ b/avmedia/source/opengl/oglwindow.cxx @@ -30,7 +30,7 @@ OGLWindow::~OGLWindow() dispose(); } -void SAL_CALL OGLWindow::update() throw (css::uno::RuntimeException, std::exception) +void SAL_CALL OGLWindow::update() { m_xContext->makeCurrent(); int nRet = gltf_prepare_renderer(&m_rHandle); @@ -44,36 +44,36 @@ void SAL_CALL OGLWindow::update() throw (css::uno::RuntimeException, std::except m_xContext->swapBuffers(); } -sal_Bool SAL_CALL OGLWindow::setZoomLevel( css::media::ZoomLevel /*eZoomLevel*/ ) throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL OGLWindow::setZoomLevel( css::media::ZoomLevel /*eZoomLevel*/ ) { return false; } -css::media::ZoomLevel SAL_CALL OGLWindow::getZoomLevel() throw (css::uno::RuntimeException, std::exception) +css::media::ZoomLevel SAL_CALL OGLWindow::getZoomLevel() { return media::ZoomLevel_ORIGINAL; } -void SAL_CALL OGLWindow::setPointerType( sal_Int32 ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL OGLWindow::setPointerType( sal_Int32 ) { } -OUString SAL_CALL OGLWindow::getImplementationName() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL OGLWindow::getImplementationName() { return OUString("com.sun.star.comp.avmedia.Window_OpenGL"); } -sal_Bool SAL_CALL OGLWindow::supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL OGLWindow::supportsService( const OUString& rServiceName ) { return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SAL_CALL OGLWindow::getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) +uno::Sequence< OUString > SAL_CALL OGLWindow::getSupportedServiceNames() { return { "com.sun.star.media.Window_OpenGL" }; } -void SAL_CALL OGLWindow::dispose() throw (uno::RuntimeException, std::exception) +void SAL_CALL OGLWindow::dispose() { assert(m_rEventHandler.GetParent()); m_rEventHandler.GetParent()->RemoveEventListener( LINK(this, OGLWindow, FocusGrabber)); @@ -81,17 +81,14 @@ void SAL_CALL OGLWindow::dispose() throw (uno::RuntimeException, std::exception) } void SAL_CALL OGLWindow::addEventListener( const uno::Reference< lang::XEventListener >& ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL OGLWindow::removeEventListener( const uno::Reference< lang::XEventListener >& ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL OGLWindow::setPosSize( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 /*nFlags*/ ) - throw (uno::RuntimeException, std::exception) { if( m_rHandle.viewport.x != nX || m_rHandle.viewport.x != nY || m_rHandle.viewport.width != nWidth || m_rHandle.viewport.height != nHeight ) @@ -105,14 +102,12 @@ void SAL_CALL OGLWindow::setPosSize( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidt } awt::Rectangle SAL_CALL OGLWindow::getPosSize() - throw (uno::RuntimeException, std::exception) { return awt::Rectangle(m_rHandle.viewport.x, m_rHandle.viewport.y, m_rHandle.viewport.width, m_rHandle.viewport.height); } void SAL_CALL OGLWindow::setVisible( sal_Bool bSet ) - throw (uno::RuntimeException, std::exception) { assert(m_rEventHandler.GetParent()); if( bSet && !m_bVisible ) @@ -130,72 +125,58 @@ void SAL_CALL OGLWindow::setVisible( sal_Bool bSet ) } void SAL_CALL OGLWindow::setEnable( sal_Bool ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL OGLWindow::setFocus() - throw (uno::RuntimeException, std::exception) { } void SAL_CALL OGLWindow::addWindowListener( const uno::Reference< awt::XWindowListener >& ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL OGLWindow::removeWindowListener( const uno::Reference< awt::XWindowListener >& ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL OGLWindow::addFocusListener( const uno::Reference< awt::XFocusListener >& ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL OGLWindow::removeFocusListener( const uno::Reference< awt::XFocusListener >& ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL OGLWindow::addKeyListener( const uno::Reference< awt::XKeyListener >& ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL OGLWindow::removeKeyListener( const uno::Reference< awt::XKeyListener >& ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL OGLWindow::addMouseListener( const uno::Reference< awt::XMouseListener >& ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL OGLWindow::removeMouseListener( const uno::Reference< awt::XMouseListener >& ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL OGLWindow::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL OGLWindow::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL OGLWindow::addPaintListener( const uno::Reference< awt::XPaintListener >& ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL OGLWindow::removePaintListener( const uno::Reference< awt::XPaintListener >& ) - throw (uno::RuntimeException, std::exception) { } diff --git a/avmedia/source/opengl/oglwindow.hxx b/avmedia/source/opengl/oglwindow.hxx index d89f2735fccb..5bb405979e37 100644 --- a/avmedia/source/opengl/oglwindow.hxx +++ b/avmedia/source/opengl/oglwindow.hxx @@ -30,36 +30,36 @@ public: OGLWindow( libgltf::glTFHandle& rHandle, const rtl::Reference & rContext, vcl::Window& rEventHandlerParent ); virtual ~OGLWindow() override; - virtual void SAL_CALL update() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::media::ZoomLevel SAL_CALL getZoomLevel() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPointerType( sal_Int32 SystemPointerType ) throw (css::uno::RuntimeException, std::exception) override; - - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; - - virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) final override; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; - - virtual void SAL_CALL setPosSize( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nFlags ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Rectangle SAL_CALL getPosSize() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setVisible( sal_Bool Visible ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setEnable( sal_Bool Enable ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFocus() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL update() override; + virtual sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) override; + virtual css::media::ZoomLevel SAL_CALL getZoomLevel() override; + virtual void SAL_CALL setPointerType( sal_Int32 SystemPointerType ) override; + + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; + + virtual void SAL_CALL dispose() final override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; + + virtual void SAL_CALL setPosSize( sal_Int32 nX, sal_Int32 nY, sal_Int32 nWidth, sal_Int32 nHeight, sal_Int16 nFlags ) override; + virtual css::awt::Rectangle SAL_CALL getPosSize() override; + virtual void SAL_CALL setVisible( sal_Bool Visible ) override; + virtual void SAL_CALL setEnable( sal_Bool Enable ) override; + virtual void SAL_CALL setFocus() override; + virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override; + virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override; + virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override; + virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override; + virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override; + virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override; + virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override; + virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override; + virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override; + virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override; + virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override; + virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override; private: DECL_LINK( FocusGrabber, VclWindowEvent&, void ); diff --git a/avmedia/source/quicktime/framegrabber.hxx b/avmedia/source/quicktime/framegrabber.hxx index 7d2a8df902c7..2441e7538e6b 100644 --- a/avmedia/source/quicktime/framegrabber.hxx +++ b/avmedia/source/quicktime/framegrabber.hxx @@ -38,12 +38,12 @@ public: bool create( const OUString& rURL ); // XFrameGrabber - virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw (css::uno::RuntimeException) override; + virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; private: css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr; diff --git a/avmedia/source/quicktime/framegrabber.mm b/avmedia/source/quicktime/framegrabber.mm index 6817af1f0798..2ade85f292b9 100644 --- a/avmedia/source/quicktime/framegrabber.mm +++ b/avmedia/source/quicktime/framegrabber.mm @@ -83,7 +83,6 @@ bool FrameGrabber::create( const ::rtl::OUString& rURL ) uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMediaTime ) - throw (uno::RuntimeException) { uno::Reference< graphic::XGraphic > xRet; @@ -103,21 +102,18 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe ::rtl::OUString SAL_CALL FrameGrabber::getImplementationName( ) - throw (uno::RuntimeException) { return ::rtl::OUString( AVMEDIA_QUICKTIME_FRAMEGRABBER_IMPLEMENTATIONNAME ); } sal_Bool SAL_CALL FrameGrabber::supportsService( const ::rtl::OUString& ServiceName ) - throw (uno::RuntimeException) { return ( ServiceName == AVMEDIA_QUICKTIME_FRAMEGRABBER_SERVICENAME ); } uno::Sequence< ::rtl::OUString > SAL_CALL FrameGrabber::getSupportedServiceNames( ) - throw (uno::RuntimeException) { return { AVMEDIA_QUICKTIME_FRAMEGRABBER_SERVICENAME }; } diff --git a/avmedia/source/quicktime/manager.hxx b/avmedia/source/quicktime/manager.hxx index 215e14c47017..113fd7728bbd 100644 --- a/avmedia/source/quicktime/manager.hxx +++ b/avmedia/source/quicktime/manager.hxx @@ -37,12 +37,12 @@ public: virtual ~Manager(); // XManager - virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const OUString& aURL ) throw (css::uno::RuntimeException) override; + virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const OUString& aURL ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; private: css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr; diff --git a/avmedia/source/quicktime/manager.mm b/avmedia/source/quicktime/manager.mm index bcb27b6d4073..735b282d07a1 100644 --- a/avmedia/source/quicktime/manager.mm +++ b/avmedia/source/quicktime/manager.mm @@ -39,7 +39,6 @@ Manager::~Manager() uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OUString& rURL ) - throw (uno::RuntimeException) { Player* pPlayer( new Player( mxMgr ) ); uno::Reference< media::XPlayer > xRet( pPlayer ); @@ -55,21 +54,18 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const ::rtl::OU ::rtl::OUString SAL_CALL Manager::getImplementationName( ) - throw (uno::RuntimeException) { return ::rtl::OUString( AVMEDIA_QUICKTIME_MANAGER_IMPLEMENTATIONNAME ); } sal_Bool SAL_CALL Manager::supportsService( const ::rtl::OUString& ServiceName ) - throw (uno::RuntimeException) { return ( ServiceName == AVMEDIA_QUICKTIME_MANAGER_SERVICENAME ); } uno::Sequence< ::rtl::OUString > SAL_CALL Manager::getSupportedServiceNames( ) - throw (uno::RuntimeException) { return { AVMEDIA_QUICKTIME_MANAGER_SERVICENAME }; } diff --git a/avmedia/source/quicktime/player.hxx b/avmedia/source/quicktime/player.hxx index 636efb034fee..f145c79fb120 100644 --- a/avmedia/source/quicktime/player.hxx +++ b/avmedia/source/quicktime/player.hxx @@ -37,25 +37,25 @@ public: bool create( const OUString& rURL ); // XPlayer - virtual void SAL_CALL start( ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL stop( ) throw (css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isPlaying( ) throw (css::uno::RuntimeException) override; - virtual double SAL_CALL getDuration( ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL setMediaTime( double fTime ) throw (css::uno::RuntimeException) override; - virtual double SAL_CALL getMediaTime( ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isPlaybackLoop( ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL setMute( sal_Bool bSet ) throw (css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isMute( ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (css::uno::RuntimeException) override; - virtual sal_Int16 SAL_CALL getVolumeDB( ) throw (css::uno::RuntimeException) override; - virtual css::awt::Size SAL_CALL getPreferredPlayerWindowSize( ) throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber( ) throw (css::uno::RuntimeException) override; + virtual void SAL_CALL start( ) override; + virtual void SAL_CALL stop( ) override; + virtual sal_Bool SAL_CALL isPlaying( ) override; + virtual double SAL_CALL getDuration( ) override; + virtual void SAL_CALL setMediaTime( double fTime ) override; + virtual double SAL_CALL getMediaTime( ) override; + virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) override; + virtual sal_Bool SAL_CALL isPlaybackLoop( ) override; + virtual void SAL_CALL setMute( sal_Bool bSet ) override; + virtual sal_Bool SAL_CALL isMute( ) override; + virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) override; + virtual sal_Int16 SAL_CALL getVolumeDB( ) override; + virtual css::awt::Size SAL_CALL getPreferredPlayerWindowSize( ) override; + virtual css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments ) override; + virtual css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber( ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; QTMovie* getMovie(); diff --git a/avmedia/source/quicktime/player.mm b/avmedia/source/quicktime/player.mm index 32ab8c6df393..d1c44306834f 100644 --- a/avmedia/source/quicktime/player.mm +++ b/avmedia/source/quicktime/player.mm @@ -101,7 +101,6 @@ bool Player::create( const ::rtl::OUString& rURL ) void SAL_CALL Player::start( ) - throw (uno::RuntimeException) { SAL_INFO ( "avmedia.quicktime", "Player::start" ); @@ -113,7 +112,6 @@ void SAL_CALL Player::start( ) void SAL_CALL Player::stop( ) - throw (uno::RuntimeException) { SAL_INFO ( "avmedia.quicktime", "Player::stop" ); if( mpMovie ) @@ -124,7 +122,6 @@ void SAL_CALL Player::stop( ) sal_Bool SAL_CALL Player::isPlaying() - throw (uno::RuntimeException) { bool bRet = false; @@ -141,7 +138,6 @@ sal_Bool SAL_CALL Player::isPlaying() double SAL_CALL Player::getDuration( ) - throw (uno::RuntimeException) { // slideshow checks for non-zero duration, so cheat here double duration = 0.01; @@ -157,7 +153,6 @@ double SAL_CALL Player::getDuration( ) void SAL_CALL Player::setMediaTime( double fTime ) - throw (uno::RuntimeException) { SAL_INFO ( "avmedia.quicktime", "Player::setMediaTime" ); @@ -169,7 +164,6 @@ void SAL_CALL Player::setMediaTime( double fTime ) double SAL_CALL Player::getMediaTime( ) - throw (uno::RuntimeException) { double position = 0.0; @@ -188,7 +182,6 @@ double SAL_CALL Player::getMediaTime( ) } void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet ) - throw (uno::RuntimeException) { SAL_INFO ( "avmedia.quicktime", "Player::setPlaybackLoop ? " << ( bSet?"True":"False" ) ); @@ -205,7 +198,6 @@ void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet ) sal_Bool SAL_CALL Player::isPlaybackLoop( ) - throw (uno::RuntimeException) { bool bRet = [[mpMovie attributeForKey:QTMovieLoopsAttribute] boolValue]; @@ -217,7 +209,6 @@ sal_Bool SAL_CALL Player::isPlaybackLoop( ) void SAL_CALL Player::setMute( sal_Bool bSet ) - throw (uno::RuntimeException) { SAL_INFO ( "avmedia.quicktime", "set mute: " << bSet << @@ -235,7 +226,6 @@ void SAL_CALL Player::setMute( sal_Bool bSet ) sal_Bool SAL_CALL Player::isMute( ) - throw (uno::RuntimeException) { SAL_INFO ( "avmedia.quicktime", "Player::isMuted" ); @@ -244,7 +234,6 @@ sal_Bool SAL_CALL Player::isMute( ) void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB ) - throw (uno::RuntimeException) { // OOo db volume -40 = QTVolume 0 // OOo db volume 0 = QTvolume 1 @@ -270,7 +259,6 @@ void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB ) sal_Int16 SAL_CALL Player::getVolumeDB( ) - throw (uno::RuntimeException) { sal_Int16 nVolumeDB = 0.0; @@ -294,7 +282,6 @@ sal_Int16 SAL_CALL Player::getVolumeDB( ) awt::Size SAL_CALL Player::getPreferredPlayerWindowSize( ) - throw (uno::RuntimeException) { NSSize nsSize = [[mpMovie attributeForKey:QTMovieNaturalSizeAttribute] sizeValue]; awt::Size aSize( nsSize.width, nsSize.height ); @@ -303,7 +290,6 @@ awt::Size SAL_CALL Player::getPreferredPlayerWindowSize( ) uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( const uno::Sequence< uno::Any >& aArguments ) - throw (uno::RuntimeException) { uno::Reference< ::media::XPlayerWindow > xRet; awt::Size aSize( getPreferredPlayerWindowSize() ); @@ -327,7 +313,6 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber( ) - throw (css::uno::RuntimeException) { uno::Reference< media::XFrameGrabber > xRet; SAL_INFO ( "avmedia.quicktime", "Player::createFrameGrabber" ); @@ -349,21 +334,18 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber( ) ::rtl::OUString SAL_CALL Player::getImplementationName( ) - throw (uno::RuntimeException) { return ::rtl::OUString( AVMEDIA_QUICKTIME_PLAYER_IMPLEMENTATIONNAME ); } sal_Bool SAL_CALL Player::supportsService( const ::rtl::OUString& ServiceName ) - throw (uno::RuntimeException) { return ( ServiceName == AVMEDIA_QUICKTIME_PLAYER_SERVICENAME ); } uno::Sequence< ::rtl::OUString > SAL_CALL Player::getSupportedServiceNames( ) - throw (uno::RuntimeException) { return { AVMEDIA_QUICKTIME_PLAYER_SERVICENAME }; } diff --git a/avmedia/source/quicktime/window.hxx b/avmedia/source/quicktime/window.hxx index cbcb9ee2faf9..8e2ec9f1cd16 100644 --- a/avmedia/source/quicktime/window.hxx +++ b/avmedia/source/quicktime/window.hxx @@ -45,39 +45,39 @@ public: void updatePointer(); // XPlayerWindow - virtual void SAL_CALL update( ) throw (css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ) throw (css::uno::RuntimeException) override; - virtual css::media::ZoomLevel SAL_CALL getZoomLevel( ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) throw (css::uno::RuntimeException) override; + virtual void SAL_CALL update( ) override; + virtual sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ) override; + virtual css::media::ZoomLevel SAL_CALL getZoomLevel( ) override; + virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) override; // XWindow - virtual void SAL_CALL setPosSize( sal_Int32 , sal_Int32 , sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (css::uno::RuntimeException) override; - virtual css::awt::Rectangle SAL_CALL getPosSize( ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL setVisible( sal_Bool ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL setEnable( sal_Bool ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL setFocus( ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException) override; + virtual void SAL_CALL setPosSize( sal_Int32 , sal_Int32 , sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) override; + virtual css::awt::Rectangle SAL_CALL getPosSize( ) override; + virtual void SAL_CALL setVisible( sal_Bool ) override; + virtual void SAL_CALL setEnable( sal_Bool ) override; + virtual void SAL_CALL setFocus( ) override; + virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override; + virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override; + virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override; + virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override; + virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override; + virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override; + virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override; + virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override; + virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override; + virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override; + virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override; + virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override; // XComponent - virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException) override; + virtual void SAL_CALL dispose( ) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; private: diff --git a/avmedia/source/quicktime/window.mm b/avmedia/source/quicktime/window.mm index 7d0db9af8efe..db3c2a6ff1ba 100644 --- a/avmedia/source/quicktime/window.mm +++ b/avmedia/source/quicktime/window.mm @@ -90,25 +90,21 @@ Window::~Window() // XPlayerWindow void SAL_CALL Window::update( ) - throw (uno::RuntimeException) { ; } sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel ) - throw (uno::RuntimeException) { return false; } media::ZoomLevel SAL_CALL Window::getZoomLevel( ) - throw (uno::RuntimeException) { return meZoomLevel; } void SAL_CALL Window::setPointerType( sal_Int32 nPointerType ) - throw (uno::RuntimeException) { mnPointerType = nPointerType; } @@ -116,7 +112,6 @@ void SAL_CALL Window::setPointerType( sal_Int32 nPointerType ) // XWindow void SAL_CALL Window::setPosSize( sal_Int32 , sal_Int32 , sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) - throw (uno::RuntimeException) { if( mpParentView && mpMovieView ) { @@ -129,7 +124,6 @@ void SAL_CALL Window::setPosSize( sal_Int32 , sal_Int32 , sal_Int32 Width, sal_I } awt::Rectangle SAL_CALL Window::getPosSize() - throw (uno::RuntimeException) { awt::Rectangle aRet; @@ -142,92 +136,77 @@ awt::Rectangle SAL_CALL Window::getPosSize() } void SAL_CALL Window::setVisible( sal_Bool ) - throw (uno::RuntimeException) { SAL_INFO ( "avmedia.quicktime", "Window::setVisible" ); } void SAL_CALL Window::setEnable( sal_Bool ) - throw (uno::RuntimeException) { ; } void SAL_CALL Window::setFocus( ) - throw (uno::RuntimeException) { SAL_INFO ( "avmedia.quicktime", "Window::setFocus" ); } void SAL_CALL Window::addWindowListener( const uno::Reference< awt::XWindowListener >& xListener ) - throw (uno::RuntimeException) { maListeners.addInterface( cppu::UnoType::get(), xListener ); } void SAL_CALL Window::removeWindowListener( const uno::Reference< awt::XWindowListener >& xListener ) - throw (uno::RuntimeException) { maListeners.removeInterface( cppu::UnoType::get(), xListener ); } void SAL_CALL Window::addFocusListener( const uno::Reference< awt::XFocusListener >& xListener ) - throw (uno::RuntimeException) { maListeners.addInterface( cppu::UnoType::get(), xListener ); } void SAL_CALL Window::removeFocusListener( const uno::Reference< awt::XFocusListener >& xListener ) - throw (uno::RuntimeException) { maListeners.removeInterface( cppu::UnoType::get(), xListener ); } void SAL_CALL Window::addKeyListener( const uno::Reference< awt::XKeyListener >& xListener ) - throw (uno::RuntimeException) { maListeners.addInterface( cppu::UnoType::get(), xListener ); } void SAL_CALL Window::removeKeyListener( const uno::Reference< awt::XKeyListener >& xListener ) - throw (uno::RuntimeException) { maListeners.removeInterface( cppu::UnoType::get(), xListener ); } void SAL_CALL Window::addMouseListener( const uno::Reference< awt::XMouseListener >& xListener ) - throw (uno::RuntimeException) { maListeners.addInterface( cppu::UnoType::get(), xListener ); } void SAL_CALL Window::removeMouseListener( const uno::Reference< awt::XMouseListener >& xListener ) - throw (uno::RuntimeException) { maListeners.removeInterface( cppu::UnoType::get(), xListener ); } void SAL_CALL Window::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener ) - throw (uno::RuntimeException) { maListeners.addInterface( cppu::UnoType::get(), xListener ); } void SAL_CALL Window::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener ) - throw (uno::RuntimeException) { maListeners.removeInterface( cppu::UnoType::get(), xListener ); } void SAL_CALL Window::addPaintListener( const uno::Reference< awt::XPaintListener >& xListener ) - throw (uno::RuntimeException) { maListeners.addInterface( cppu::UnoType::get(), xListener ); } void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintListener >& xListener ) - throw (uno::RuntimeException) { maListeners.removeInterface( cppu::UnoType::get(), xListener ); } @@ -235,18 +214,15 @@ void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintList // XComponent void SAL_CALL Window::dispose( ) - throw (uno::RuntimeException) { } void SAL_CALL Window::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException) { maListeners.addInterface( cppu::UnoType::get(), xListener ); } void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException) { maListeners.removeInterface( cppu::UnoType::get(), xListener ); } @@ -254,19 +230,16 @@ void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventLis // XServiceInfo ::rtl::OUString SAL_CALL Window::getImplementationName( ) - throw (uno::RuntimeException) { return ::rtl::OUString( AVMEDIA_QUICKTIME_WINDOW_IMPLEMENTATIONNAME ); } sal_Bool SAL_CALL Window::supportsService( const ::rtl::OUString& ServiceName ) - throw (uno::RuntimeException) { return ( ServiceName == AVMEDIA_QUICKTIME_WINDOW_SERVICENAME ); } uno::Sequence< ::rtl::OUString > SAL_CALL Window::getSupportedServiceNames( ) - throw (uno::RuntimeException) { return { AVMEDIA_QUICKTIME_WINDOW_SERVICENAME }; } diff --git a/avmedia/source/viewer/mediaevent_impl.cxx b/avmedia/source/viewer/mediaevent_impl.cxx index 87ec80daa2b4..fac08d070870 100644 --- a/avmedia/source/viewer/mediaevent_impl.cxx +++ b/avmedia/source/viewer/mediaevent_impl.cxx @@ -46,13 +46,11 @@ void MediaEventListenersImpl::cleanUp() void SAL_CALL MediaEventListenersImpl::disposing( const css::lang::EventObject& ) - throw (css::uno::RuntimeException, std::exception) { } void SAL_CALL MediaEventListenersImpl::keyPressed( const css::awt::KeyEvent& e ) - throw (css::uno::RuntimeException, std::exception) { const ::osl::MutexGuard aGuard( maMutex ); const SolarMutexGuard aAppGuard; @@ -71,7 +69,6 @@ void SAL_CALL MediaEventListenersImpl::keyPressed( const css::awt::KeyEvent& e ) void SAL_CALL MediaEventListenersImpl::keyReleased( const css::awt::KeyEvent& e ) - throw (css::uno::RuntimeException, std::exception) { const ::osl::MutexGuard aGuard( maMutex ); const SolarMutexGuard aAppGuard; @@ -89,7 +86,6 @@ void SAL_CALL MediaEventListenersImpl::keyReleased( const css::awt::KeyEvent& e void SAL_CALL MediaEventListenersImpl::mousePressed( const css::awt::MouseEvent& e ) - throw (css::uno::RuntimeException, std::exception) { const ::osl::MutexGuard aGuard( maMutex ); const SolarMutexGuard aAppGuard; @@ -109,7 +105,6 @@ void SAL_CALL MediaEventListenersImpl::mousePressed( const css::awt::MouseEvent& void SAL_CALL MediaEventListenersImpl::mouseReleased( const css::awt::MouseEvent& e ) - throw (css::uno::RuntimeException, std::exception) { const ::osl::MutexGuard aGuard( maMutex ); const SolarMutexGuard aAppGuard; @@ -129,7 +124,6 @@ void SAL_CALL MediaEventListenersImpl::mouseReleased( const css::awt::MouseEvent void SAL_CALL MediaEventListenersImpl::mouseEntered( const css::awt::MouseEvent& ) - throw (css::uno::RuntimeException, std::exception) { const ::osl::MutexGuard aGuard( maMutex ); const SolarMutexGuard aAppGuard; @@ -141,7 +135,6 @@ void SAL_CALL MediaEventListenersImpl::mouseEntered( const css::awt::MouseEvent& void SAL_CALL MediaEventListenersImpl::mouseExited( const css::awt::MouseEvent& ) - throw (css::uno::RuntimeException, std::exception) { const ::osl::MutexGuard aGuard( maMutex ); const SolarMutexGuard aAppGuard; @@ -153,7 +146,6 @@ void SAL_CALL MediaEventListenersImpl::mouseExited( const css::awt::MouseEvent& void SAL_CALL MediaEventListenersImpl::mouseDragged( const css::awt::MouseEvent& e ) - throw (css::uno::RuntimeException, std::exception) { const ::osl::MutexGuard aGuard( maMutex ); const SolarMutexGuard aAppGuard; @@ -167,7 +159,6 @@ void SAL_CALL MediaEventListenersImpl::mouseDragged( const css::awt::MouseEvent& void SAL_CALL MediaEventListenersImpl::mouseMoved( const css::awt::MouseEvent& e ) - throw (css::uno::RuntimeException, std::exception) { const ::osl::MutexGuard aGuard( maMutex ); const SolarMutexGuard aAppGuard; @@ -181,13 +172,11 @@ void SAL_CALL MediaEventListenersImpl::mouseMoved( const css::awt::MouseEvent& e void SAL_CALL MediaEventListenersImpl::focusGained( const css::awt::FocusEvent& ) - throw (css::uno::RuntimeException, std::exception) { } void SAL_CALL MediaEventListenersImpl::focusLost( const css::awt::FocusEvent& ) - throw (css::uno::RuntimeException, std::exception) { } diff --git a/avmedia/source/viewer/mediaevent_impl.hxx b/avmedia/source/viewer/mediaevent_impl.hxx index e73e2968882c..f98279833333 100644 --- a/avmedia/source/viewer/mediaevent_impl.hxx +++ b/avmedia/source/viewer/mediaevent_impl.hxx @@ -50,23 +50,23 @@ namespace avmedia protected: // XKeyListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL keyPressed( const css::awt::KeyEvent& e ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL keyReleased( const css::awt::KeyEvent& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; + virtual void SAL_CALL keyPressed( const css::awt::KeyEvent& e ) override; + virtual void SAL_CALL keyReleased( const css::awt::KeyEvent& e ) override; // XMouseListener - virtual void SAL_CALL mousePressed( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL mouseReleased( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL mouseEntered( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL mouseExited( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mousePressed( const css::awt::MouseEvent& e ) override; + virtual void SAL_CALL mouseReleased( const css::awt::MouseEvent& e ) override; + virtual void SAL_CALL mouseEntered( const css::awt::MouseEvent& e ) override; + virtual void SAL_CALL mouseExited( const css::awt::MouseEvent& e ) override; // XMouseMotionListener - virtual void SAL_CALL mouseDragged( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL mouseMoved( const css::awt::MouseEvent& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mouseDragged( const css::awt::MouseEvent& e ) override; + virtual void SAL_CALL mouseMoved( const css::awt::MouseEvent& e ) override; // XFocusListener - virtual void SAL_CALL focusGained( const css::awt::FocusEvent& e ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL focusLost( const css::awt::FocusEvent& e ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL focusGained( const css::awt::FocusEvent& e ) override; + virtual void SAL_CALL focusLost( const css::awt::FocusEvent& e ) override; private: diff --git a/avmedia/source/vlc/vlcframegrabber.cxx b/avmedia/source/vlc/vlcframegrabber.cxx index a21af8e47d9b..8642f08a63a1 100644 --- a/avmedia/source/vlc/vlcframegrabber.cxx +++ b/avmedia/source/vlc/vlcframegrabber.cxx @@ -67,7 +67,6 @@ VLCFrameGrabber::VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString } ::uno::Reference< css::graphic::XGraphic > SAL_CALL VLCFrameGrabber::grabFrame( double fMediaTime ) - throw ( css::uno::RuntimeException, std::exception ) { osl::Condition condition; @@ -112,19 +111,17 @@ VLCFrameGrabber::VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString return Graphic( bitmap ).GetXGraphic(); } -::rtl::OUString SAL_CALL VLCFrameGrabber::getImplementationName() throw ( css::uno::RuntimeException, std::exception ) +::rtl::OUString SAL_CALL VLCFrameGrabber::getImplementationName() { return AVMEDIA_VLC_GRABBER_IMPLEMENTATIONNAME; } sal_Bool SAL_CALL VLCFrameGrabber::supportsService( const ::rtl::OUString& serviceName ) - throw ( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, serviceName); } ::uno::Sequence< ::rtl::OUString > SAL_CALL VLCFrameGrabber::getSupportedServiceNames() - throw ( css::uno::RuntimeException, std::exception ) { return { AVMEDIA_VLC_GRABBER_SERVICENAME }; } diff --git a/avmedia/source/vlc/vlcframegrabber.hxx b/avmedia/source/vlc/vlcframegrabber.hxx index 2f5419dabc67..b78815006546 100644 --- a/avmedia/source/vlc/vlcframegrabber.hxx +++ b/avmedia/source/vlc/vlcframegrabber.hxx @@ -40,15 +40,11 @@ class VLCFrameGrabber : public FrameGrabber_BASE public: VLCFrameGrabber( wrapper::EventHandler& eh, const rtl::OUString& url ); - css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) - throw ( css::uno::RuntimeException, std::exception ) override; - - ::rtl::OUString SAL_CALL getImplementationName() - throw ( css::uno::RuntimeException, std::exception ) override; - sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ) - throw ( css::uno::RuntimeException, std::exception ) override; - css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() - throw ( css::uno::RuntimeException, std::exception ) override; + css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) override; + + ::rtl::OUString SAL_CALL getImplementationName() override; + sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ) override; + css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() override; }; } diff --git a/avmedia/source/vlc/vlcmanager.cxx b/avmedia/source/vlc/vlcmanager.cxx index b5819ee40004..2b1c73fa70bf 100644 --- a/avmedia/source/vlc/vlcmanager.cxx +++ b/avmedia/source/vlc/vlcmanager.cxx @@ -83,7 +83,6 @@ Manager::~Manager() } uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const rtl::OUString& rURL ) - throw (uno::RuntimeException, std::exception) { if ( !m_is_vlc_found ) throw uno::RuntimeException("VLC not found", nullptr); @@ -107,19 +106,16 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const rtl::OUSt } rtl::OUString SAL_CALL Manager::getImplementationName() - throw (uno::RuntimeException, std::exception) { return VLC_IMPLEMENTATION_NAME; } sal_Bool SAL_CALL Manager::supportsService( const rtl::OUString& serviceName ) - throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, serviceName); } uno::Sequence< rtl::OUString > SAL_CALL Manager::getSupportedServiceNames() - throw (uno::RuntimeException, std::exception) { return { VLC_SERVICENAME }; } diff --git a/avmedia/source/vlc/vlcmanager.hxx b/avmedia/source/vlc/vlcmanager.hxx index cbc6f5ed1cac..f820fc1f72ee 100644 --- a/avmedia/source/vlc/vlcmanager.hxx +++ b/avmedia/source/vlc/vlcmanager.hxx @@ -37,11 +37,11 @@ public: explicit Manager( const css::uno::Reference< css::lang::XMultiServiceFactory >& rxMgr ); virtual ~Manager() override; - css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const rtl::OUString& aURL ) throw (css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const rtl::OUString& aURL ) override; - rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL supportsService( const rtl::OUString& serviceName ) throw (css::uno::RuntimeException, std::exception) override; - css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + rtl::OUString SAL_CALL getImplementationName() override; + sal_Bool SAL_CALL supportsService( const rtl::OUString& serviceName ) override; + css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames() override; private: css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr; diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx index 5a9e94dedcd2..b93157d90da3 100644 --- a/avmedia/source/vlc/vlcplayer.cxx +++ b/avmedia/source/vlc/vlcplayer.cxx @@ -65,7 +65,7 @@ unsigned VLCPlayer::getHeight() const return mPlayer.getHeight(); } -void SAL_CALL VLCPlayer::start() throw ( css::uno::RuntimeException, std::exception ) +void SAL_CALL VLCPlayer::start() { ::osl::MutexGuard aGuard(m_aMutex); if (!mPlayer.play()) @@ -74,19 +74,19 @@ void SAL_CALL VLCPlayer::start() throw ( css::uno::RuntimeException, std::except } } -void SAL_CALL VLCPlayer::stop() throw ( css::uno::RuntimeException, std::exception ) +void SAL_CALL VLCPlayer::stop() { ::osl::MutexGuard aGuard(m_aMutex); mPlayer.pause(); } -sal_Bool SAL_CALL VLCPlayer::isPlaying() throw ( css::uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL VLCPlayer::isPlaying() { ::osl::MutexGuard aGuard(m_aMutex); return mPlayer.isPlaying(); } -double SAL_CALL VLCPlayer::getDuration() throw ( css::uno::RuntimeException, std::exception ) +double SAL_CALL VLCPlayer::getDuration() { ::osl::MutexGuard aGuard(m_aMutex); return static_cast( mMedia.getDuration() ) / MS_IN_SEC; @@ -98,7 +98,7 @@ void SAL_CALL VLCPlayer::setScale( float factor ) mPlayer.setScale( factor ); } -void SAL_CALL VLCPlayer::setMediaTime( double fTime ) throw ( css::uno::RuntimeException, std::exception ) +void SAL_CALL VLCPlayer::setMediaTime( double fTime ) { ::osl::MutexGuard aGuard(m_aMutex); if ( fTime < 0.00000001 && !mPlayer.isPlaying() ) @@ -109,7 +109,7 @@ void SAL_CALL VLCPlayer::setMediaTime( double fTime ) throw ( css::uno::RuntimeE mPlayer.setTime( fTime * MS_IN_SEC ); } -double SAL_CALL VLCPlayer::getMediaTime() throw ( css::uno::RuntimeException, std::exception ) +double SAL_CALL VLCPlayer::getMediaTime() { ::osl::MutexGuard aGuard(m_aMutex); return static_cast( mPlayer.getTime() ) / MS_IN_SEC; @@ -123,7 +123,7 @@ void VLCPlayer::replay() start(); } -void SAL_CALL VLCPlayer::setPlaybackLoop( sal_Bool bSet ) throw ( css::uno::RuntimeException, std::exception ) +void SAL_CALL VLCPlayer::setPlaybackLoop( sal_Bool bSet ) { ::osl::MutexGuard aGuard(m_aMutex); mPlaybackLoop = bSet; @@ -134,37 +134,37 @@ void SAL_CALL VLCPlayer::setPlaybackLoop( sal_Bool bSet ) throw ( css::uno::Runt mEventManager.onEndReached(); } -sal_Bool SAL_CALL VLCPlayer::isPlaybackLoop() throw ( css::uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL VLCPlayer::isPlaybackLoop() { ::osl::MutexGuard aGuard(m_aMutex); return mPlaybackLoop; } -void SAL_CALL VLCPlayer::setVolumeDB( ::sal_Int16 nDB ) throw ( css::uno::RuntimeException, std::exception ) +void SAL_CALL VLCPlayer::setVolumeDB( ::sal_Int16 nDB ) { ::osl::MutexGuard aGuard(m_aMutex); mPlayer.setVolume( static_cast( ( nDB + 40 ) * 10.0 / 4 ) ); } -::sal_Int16 SAL_CALL VLCPlayer::getVolumeDB() throw ( css::uno::RuntimeException, std::exception ) +::sal_Int16 SAL_CALL VLCPlayer::getVolumeDB() { ::osl::MutexGuard aGuard(m_aMutex); return static_cast( mPlayer.getVolume() / 10.0 * 4 - 40 ); } -void SAL_CALL VLCPlayer::setMute( sal_Bool bSet ) throw ( css::uno::RuntimeException, std::exception ) +void SAL_CALL VLCPlayer::setMute( sal_Bool bSet ) { ::osl::MutexGuard aGuard(m_aMutex); mPlayer.setMute( bSet ); } -sal_Bool SAL_CALL VLCPlayer::isMute() throw ( css::uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL VLCPlayer::isMute() { ::osl::MutexGuard aGuard(m_aMutex); return mPlayer.getMute(); } -css::awt::Size SAL_CALL VLCPlayer::getPreferredPlayerWindowSize() throw ( css::uno::RuntimeException, std::exception ) +css::awt::Size SAL_CALL VLCPlayer::getPreferredPlayerWindowSize() { return css::awt::Size( 480, 360 ); } @@ -215,7 +215,6 @@ void VLCPlayer::setVideoSize( unsigned width, unsigned height ) } uno::Reference< css::media::XPlayerWindow > SAL_CALL VLCPlayer::createPlayerWindow( const uno::Sequence< uno::Any >& aArguments ) - throw ( css::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -238,7 +237,6 @@ uno::Reference< css::media::XPlayerWindow > SAL_CALL VLCPlayer::createPlayerWind } uno::Reference< css::media::XFrameGrabber > SAL_CALL VLCPlayer::createFrameGrabber() - throw ( css::uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard(m_aMutex); @@ -252,19 +250,16 @@ uno::Reference< css::media::XFrameGrabber > SAL_CALL VLCPlayer::createFrameGrabb } ::rtl::OUString SAL_CALL VLCPlayer::getImplementationName() - throw ( css::uno::RuntimeException, std::exception ) { return AVMEDIA_VLC_PLAYER_IMPLEMENTATIONNAME; } sal_Bool SAL_CALL VLCPlayer::supportsService( const ::rtl::OUString& serviceName ) - throw ( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, serviceName); } ::uno::Sequence< ::rtl::OUString > SAL_CALL VLCPlayer::getSupportedServiceNames() - throw ( css::uno::RuntimeException, std::exception ) { return { AVMEDIA_VLC_PLAYER_SERVICENAME }; } diff --git a/avmedia/source/vlc/vlcplayer.hxx b/avmedia/source/vlc/vlcplayer.hxx index 3cbecdd19fd5..e2c7f0c32b2f 100644 --- a/avmedia/source/vlc/vlcplayer.hxx +++ b/avmedia/source/vlc/vlcplayer.hxx @@ -61,30 +61,25 @@ public: void SAL_CALL setScale( float factor ); void SAL_CALL setWindowID( const intptr_t windowID ); - void SAL_CALL start() throw ( css::uno::RuntimeException, std::exception ) override; - void SAL_CALL stop() throw ( css::uno::RuntimeException, std::exception ) override; - sal_Bool SAL_CALL isPlaying() throw ( css::uno::RuntimeException, std::exception ) override; - double SAL_CALL getDuration() throw ( css::uno::RuntimeException, std::exception ) override; - void SAL_CALL setMediaTime( double fTime ) throw ( css::uno::RuntimeException, std::exception ) override; - double SAL_CALL getMediaTime() throw ( css::uno::RuntimeException, std::exception ) override; - void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw ( css::uno::RuntimeException, std::exception ) override; - sal_Bool SAL_CALL isPlaybackLoop() throw ( css::uno::RuntimeException, std::exception ) override; - void SAL_CALL setVolumeDB( ::sal_Int16 nDB ) throw ( css::uno::RuntimeException, std::exception ) override; - ::sal_Int16 SAL_CALL getVolumeDB() throw ( css::uno::RuntimeException, std::exception ) override; - void SAL_CALL setMute( sal_Bool bSet ) throw ( css::uno::RuntimeException, std::exception ) override; - sal_Bool SAL_CALL isMute() throw ( css::uno::RuntimeException, std::exception ) override; - css::awt::Size SAL_CALL getPreferredPlayerWindowSize() throw ( css::uno::RuntimeException, std::exception ) override; - css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw ( css::uno::RuntimeException, std::exception ) override; - css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber() - throw ( css::uno::RuntimeException, std::exception ) override; + void SAL_CALL start() override; + void SAL_CALL stop() override; + sal_Bool SAL_CALL isPlaying() override; + double SAL_CALL getDuration() override; + void SAL_CALL setMediaTime( double fTime ) override; + double SAL_CALL getMediaTime() override; + void SAL_CALL setPlaybackLoop( sal_Bool bSet ) override; + sal_Bool SAL_CALL isPlaybackLoop() override; + void SAL_CALL setVolumeDB( ::sal_Int16 nDB ) override; + ::sal_Int16 SAL_CALL getVolumeDB() override; + void SAL_CALL setMute( sal_Bool bSet ) override; + sal_Bool SAL_CALL isMute() override; + css::awt::Size SAL_CALL getPreferredPlayerWindowSize() override; + css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments ) override; + css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber() override; - ::rtl::OUString SAL_CALL getImplementationName() - throw ( css::uno::RuntimeException, std::exception ) override; - sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ) - throw ( css::uno::RuntimeException, std::exception ) override; - css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() - throw ( css::uno::RuntimeException, std::exception ) override; + ::rtl::OUString SAL_CALL getImplementationName() override; + sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ) override; + css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() override; private: void replay(); diff --git a/avmedia/source/vlc/vlcwindow.cxx b/avmedia/source/vlc/vlcwindow.cxx index 2a4ad61bb27a..e3c0ab26147c 100644 --- a/avmedia/source/vlc/vlcwindow.cxx +++ b/avmedia/source/vlc/vlcwindow.cxx @@ -46,11 +46,11 @@ VLCWindow::~VLCWindow() mPlayer.setWindowID( mPrevWinID ); } -void SAL_CALL VLCWindow::update() throw (css::uno::RuntimeException, std::exception) +void SAL_CALL VLCWindow::update() { } -sal_Bool SAL_CALL VLCWindow::setZoomLevel( css::media::ZoomLevel eZoomLevel ) throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL VLCWindow::setZoomLevel( css::media::ZoomLevel eZoomLevel ) { bool bRet = false; @@ -82,46 +82,43 @@ sal_Bool SAL_CALL VLCWindow::setZoomLevel( css::media::ZoomLevel eZoomLevel ) th return bRet; } -css::media::ZoomLevel SAL_CALL VLCWindow::getZoomLevel() throw (css::uno::RuntimeException, std::exception) +css::media::ZoomLevel SAL_CALL VLCWindow::getZoomLevel() { return meZoomLevel; } -void SAL_CALL VLCWindow::setPointerType( ::sal_Int32 ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL VLCWindow::setPointerType( ::sal_Int32 ) { } -::rtl::OUString SAL_CALL VLCWindow::getImplementationName() throw (css::uno::RuntimeException, std::exception) +::rtl::OUString SAL_CALL VLCWindow::getImplementationName() { return AVMEDIA_VLC_WINDOW_IMPLEMENTATIONNAME; } -sal_Bool SAL_CALL VLCWindow::supportsService( const ::rtl::OUString& serviceName ) throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL VLCWindow::supportsService( const ::rtl::OUString& serviceName ) { return cppu::supportsService(this, serviceName); } -uno::Sequence< ::rtl::OUString > SAL_CALL VLCWindow::getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) +uno::Sequence< ::rtl::OUString > SAL_CALL VLCWindow::getSupportedServiceNames() { return { AVMEDIA_VLC_WINDOW_SERVICENAME }; } -void SAL_CALL VLCWindow::dispose() throw (uno::RuntimeException, std::exception) +void SAL_CALL VLCWindow::dispose() { } void SAL_CALL VLCWindow::addEventListener( const uno::Reference< lang::XEventListener >& ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::removeEventListener( const uno::Reference< lang::XEventListener >& ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 /* Flags */ ) - throw (uno::RuntimeException, std::exception) { mSize.X = X; mSize.Y = Y; @@ -130,83 +127,67 @@ void SAL_CALL VLCWindow::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, } awt::Rectangle SAL_CALL VLCWindow::getPosSize() - throw (uno::RuntimeException, std::exception) { return mSize; } void SAL_CALL VLCWindow::setVisible( sal_Bool ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::setEnable( sal_Bool ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::setFocus() - throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::addWindowListener( const uno::Reference< awt::XWindowListener >& ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::removeWindowListener( const uno::Reference< awt::XWindowListener >& ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::addFocusListener( const uno::Reference< awt::XFocusListener >& ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::removeFocusListener( const uno::Reference< awt::XFocusListener >& ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::addKeyListener( const uno::Reference< awt::XKeyListener >& ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::removeKeyListener( const uno::Reference< awt::XKeyListener >& ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::addMouseListener( const uno::Reference< awt::XMouseListener >& ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::removeMouseListener( const uno::Reference< awt::XMouseListener >& ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::addPaintListener( const uno::Reference< awt::XPaintListener >& ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL VLCWindow::removePaintListener( const uno::Reference< awt::XPaintListener >& ) - throw (uno::RuntimeException, std::exception) { } diff --git a/avmedia/source/vlc/vlcwindow.hxx b/avmedia/source/vlc/vlcwindow.hxx index 2fc3991874e9..eaab56d718d2 100644 --- a/avmedia/source/vlc/vlcwindow.hxx +++ b/avmedia/source/vlc/vlcwindow.hxx @@ -37,36 +37,36 @@ public: VLCWindow( VLCPlayer& player, const intptr_t prevWinID ); virtual ~VLCWindow() override; - void SAL_CALL update() throw (css::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) throw (css::uno::RuntimeException, std::exception) override; - css::media::ZoomLevel SAL_CALL getZoomLevel() throw (css::uno::RuntimeException, std::exception) override; - void SAL_CALL setPointerType( ::sal_Int32 SystemPointerType ) throw (css::uno::RuntimeException, std::exception) override; + void SAL_CALL update() override; + sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) override; + css::media::ZoomLevel SAL_CALL getZoomLevel() override; + void SAL_CALL setPointerType( ::sal_Int32 SystemPointerType ) override; - ::rtl::OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; - sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ) throw (css::uno::RuntimeException, std::exception) override; - css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + ::rtl::OUString SAL_CALL getImplementationName() override; + sal_Bool SAL_CALL supportsService( const ::rtl::OUString& serviceName ) override; + css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames() override; - void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; - void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; + void SAL_CALL dispose() override; + void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; + void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; - void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (css::uno::RuntimeException, std::exception) override; - css::awt::Rectangle SAL_CALL getPosSize() throw (css::uno::RuntimeException, std::exception) override; - void SAL_CALL setVisible( sal_Bool Visible ) throw (css::uno::RuntimeException, std::exception) override; - void SAL_CALL setEnable( sal_Bool Enable ) throw (css::uno::RuntimeException, std::exception) override; - void SAL_CALL setFocus() throw (css::uno::RuntimeException, std::exception) override; - void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) override; + css::awt::Rectangle SAL_CALL getPosSize() override; + void SAL_CALL setVisible( sal_Bool Visible ) override; + void SAL_CALL setEnable( sal_Bool Enable ) override; + void SAL_CALL setFocus() override; + void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override; + void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override; + void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override; + void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override; + void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override; + void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override; + void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override; + void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override; + void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override; + void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override; + void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override; + void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override; }; } diff --git a/avmedia/source/win/framegrabber.cxx b/avmedia/source/win/framegrabber.cxx index 88408caa8a13..3d1f5906e2fc 100644 --- a/avmedia/source/win/framegrabber.cxx +++ b/avmedia/source/win/framegrabber.cxx @@ -106,7 +106,6 @@ bool FrameGrabber::create( const OUString& rURL ) uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMediaTime ) - throw (uno::RuntimeException) { uno::Reference< graphic::XGraphic > xRet; IMediaDet* pDet = implCreateMediaDet( maURL ); @@ -203,21 +202,18 @@ uno::Reference< graphic::XGraphic > SAL_CALL FrameGrabber::grabFrame( double fMe OUString SAL_CALL FrameGrabber::getImplementationName( ) - throw (uno::RuntimeException) { return OUString( AVMEDIA_WIN_FRAMEGRABBER_IMPLEMENTATIONNAME ); } sal_Bool SAL_CALL FrameGrabber::supportsService( const OUString& ServiceName ) - throw (uno::RuntimeException) { return cppu::supportsService(this, ServiceName); } uno::Sequence< OUString > SAL_CALL FrameGrabber::getSupportedServiceNames( ) - throw (uno::RuntimeException) { return { AVMEDIA_WIN_FRAMEGRABBER_SERVICENAME }; } diff --git a/avmedia/source/win/framegrabber.hxx b/avmedia/source/win/framegrabber.hxx index 8b3fd49f03b0..88ac4fc04674 100644 --- a/avmedia/source/win/framegrabber.hxx +++ b/avmedia/source/win/framegrabber.hxx @@ -39,12 +39,12 @@ public: bool create( const OUString& rURL ); // XFrameGrabber - virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) throw (css::uno::RuntimeException) override; + virtual css::uno::Reference< css::graphic::XGraphic > SAL_CALL grabFrame( double fMediaTime ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; private: diff --git a/avmedia/source/win/manager.cxx b/avmedia/source/win/manager.cxx index c024f7ff19a7..4282b2599ff8 100644 --- a/avmedia/source/win/manager.cxx +++ b/avmedia/source/win/manager.cxx @@ -42,7 +42,6 @@ Manager::~Manager() uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const OUString& rURL ) - throw (uno::RuntimeException) { Player* pPlayer( new Player( mxMgr ) ); uno::Reference< media::XPlayer > xRet( pPlayer ); @@ -56,21 +55,18 @@ uno::Reference< media::XPlayer > SAL_CALL Manager::createPlayer( const OUString& OUString SAL_CALL Manager::getImplementationName( ) - throw (uno::RuntimeException) { return OUString( AVMEDIA_WIN_MANAGER_IMPLEMENTATIONNAME ); } sal_Bool SAL_CALL Manager::supportsService( const OUString& ServiceName ) - throw (uno::RuntimeException) { return cppu::supportsService(this, ServiceName); } uno::Sequence< OUString > SAL_CALL Manager::getSupportedServiceNames( ) - throw (uno::RuntimeException) { return { AVMEDIA_WIN_MANAGER_SERVICENAME }; } diff --git a/avmedia/source/win/manager.hxx b/avmedia/source/win/manager.hxx index fcd0c69a2c23..80454708319c 100644 --- a/avmedia/source/win/manager.hxx +++ b/avmedia/source/win/manager.hxx @@ -36,12 +36,12 @@ public: ~Manager() override; // XManager - virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const OUString& aURL ) throw (css::uno::RuntimeException) override; + virtual css::uno::Reference< css::media::XPlayer > SAL_CALL createPlayer( const OUString& aURL ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; private: css::uno::Reference< css::lang::XMultiServiceFactory > mxMgr; diff --git a/avmedia/source/win/player.cxx b/avmedia/source/win/player.cxx index a5f9f4e62888..a7c3e6bd766d 100644 --- a/avmedia/source/win/player.cxx +++ b/avmedia/source/win/player.cxx @@ -246,7 +246,6 @@ long Player::processEvent() void SAL_CALL Player::start( ) - throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); if( mpMC ) @@ -290,7 +289,6 @@ void SAL_CALL Player::start( ) void SAL_CALL Player::stop( ) - throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); if( mpMC ) @@ -299,7 +297,6 @@ void SAL_CALL Player::stop( ) sal_Bool SAL_CALL Player::isPlaying() - throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); @@ -314,7 +311,6 @@ sal_Bool SAL_CALL Player::isPlaying() double SAL_CALL Player::getDuration( ) - throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); @@ -328,7 +324,6 @@ double SAL_CALL Player::getDuration( ) void SAL_CALL Player::setMediaTime( double fTime ) - throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); @@ -345,7 +340,6 @@ void SAL_CALL Player::setMediaTime( double fTime ) double SAL_CALL Player::getMediaTime( ) - throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); @@ -359,7 +353,6 @@ double SAL_CALL Player::getMediaTime( ) void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet ) - throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); @@ -368,7 +361,6 @@ void SAL_CALL Player::setPlaybackLoop( sal_Bool bSet ) sal_Bool SAL_CALL Player::isPlaybackLoop( ) - throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); @@ -377,7 +369,6 @@ sal_Bool SAL_CALL Player::isPlaybackLoop( ) void SAL_CALL Player::setMute( sal_Bool bSet ) - throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); @@ -390,7 +381,6 @@ void SAL_CALL Player::setMute( sal_Bool bSet ) sal_Bool SAL_CALL Player::isMute( ) - throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); @@ -399,7 +389,6 @@ sal_Bool SAL_CALL Player::isMute( ) void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB ) - throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); @@ -411,7 +400,6 @@ void SAL_CALL Player::setVolumeDB( sal_Int16 nVolumeDB ) sal_Int16 SAL_CALL Player::getVolumeDB( ) - throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); @@ -420,7 +408,6 @@ sal_Int16 SAL_CALL Player::getVolumeDB( ) awt::Size SAL_CALL Player::getPreferredPlayerWindowSize( ) - throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); @@ -440,7 +427,6 @@ awt::Size SAL_CALL Player::getPreferredPlayerWindowSize( ) uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( const uno::Sequence< uno::Any >& aArguments ) - throw (uno::RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); @@ -462,7 +448,6 @@ uno::Reference< ::media::XPlayerWindow > SAL_CALL Player::createPlayerWindow( co uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber( ) - throw (uno::RuntimeException) { uno::Reference< media::XFrameGrabber > xRet; @@ -481,21 +466,18 @@ uno::Reference< media::XFrameGrabber > SAL_CALL Player::createFrameGrabber( ) OUString SAL_CALL Player::getImplementationName( ) - throw (uno::RuntimeException) { return OUString( AVMEDIA_WIN_PLAYER_IMPLEMENTATIONNAME ); } sal_Bool SAL_CALL Player::supportsService( const OUString& ServiceName ) - throw (uno::RuntimeException) { return cppu::supportsService(this, ServiceName); } uno::Sequence< OUString > SAL_CALL Player::getSupportedServiceNames( ) - throw (uno::RuntimeException) { return { AVMEDIA_WIN_PLAYER_SERVICENAME }; } diff --git a/avmedia/source/win/player.hxx b/avmedia/source/win/player.hxx index 425ae00dada3..02fb5ec8e9c8 100644 --- a/avmedia/source/win/player.hxx +++ b/avmedia/source/win/player.hxx @@ -66,26 +66,26 @@ public: const IVideoWindow* getVideoWindow() const; // XPlayer - virtual void SAL_CALL start( ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL stop( ) throw (css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isPlaying( ) throw (css::uno::RuntimeException) override; - virtual double SAL_CALL getDuration( ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL setMediaTime( double fTime ) throw (css::uno::RuntimeException) override; - virtual double SAL_CALL getMediaTime( ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) throw (css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isPlaybackLoop( ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL setMute( sal_Bool bSet ) throw (css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isMute( ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) throw (css::uno::RuntimeException) override; - virtual sal_Int16 SAL_CALL getVolumeDB( ) throw (css::uno::RuntimeException) override; - virtual css::awt::Size SAL_CALL getPreferredPlayerWindowSize( ) throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber( ) throw (css::uno::RuntimeException) override; + virtual void SAL_CALL start( ) override; + virtual void SAL_CALL stop( ) override; + virtual sal_Bool SAL_CALL isPlaying( ) override; + virtual double SAL_CALL getDuration( ) override; + virtual void SAL_CALL setMediaTime( double fTime ) override; + virtual double SAL_CALL getMediaTime( ) override; + virtual void SAL_CALL setPlaybackLoop( sal_Bool bSet ) override; + virtual sal_Bool SAL_CALL isPlaybackLoop( ) override; + virtual void SAL_CALL setMute( sal_Bool bSet ) override; + virtual sal_Bool SAL_CALL isMute( ) override; + virtual void SAL_CALL setVolumeDB( sal_Int16 nVolumeDB ) override; + virtual sal_Int16 SAL_CALL getVolumeDB( ) override; + virtual css::awt::Size SAL_CALL getPreferredPlayerWindowSize( ) override; + virtual css::uno::Reference< css::media::XPlayerWindow > SAL_CALL createPlayerWindow( const css::uno::Sequence< css::uno::Any >& aArguments ) override; + virtual css::uno::Reference< css::media::XFrameGrabber > SAL_CALL createFrameGrabber( ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // ::cppu::OComponentHelper virtual void SAL_CALL disposing() override; diff --git a/avmedia/source/win/window.cxx b/avmedia/source/win/window.cxx index ba30b07403c5..9886ada2b5a1 100644 --- a/avmedia/source/win/window.cxx +++ b/avmedia/source/win/window.cxx @@ -344,13 +344,11 @@ void Window::updatePointer() } void SAL_CALL Window::update( ) - throw (uno::RuntimeException) { ::RedrawWindow( mnFrameWnd, nullptr, nullptr, RDW_ALLCHILDREN | RDW_INVALIDATE | RDW_UPDATENOW | RDW_ERASE ); } sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel eZoomLevel ) - throw (uno::RuntimeException) { boolean bRet = false; @@ -370,19 +368,16 @@ sal_Bool SAL_CALL Window::setZoomLevel( media::ZoomLevel eZoomLevel ) } media::ZoomLevel SAL_CALL Window::getZoomLevel( ) - throw (uno::RuntimeException) { return meZoomLevel; } void SAL_CALL Window::setPointerType( sal_Int32 nPointerType ) - throw (uno::RuntimeException) { mnPointerType = nPointerType; } void SAL_CALL Window::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 ) - throw (uno::RuntimeException) { if( mnFrameWnd ) { @@ -392,7 +387,6 @@ void SAL_CALL Window::setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal } awt::Rectangle SAL_CALL Window::getPosSize() - throw (uno::RuntimeException) { awt::Rectangle aRet; @@ -413,7 +407,6 @@ awt::Rectangle SAL_CALL Window::getPosSize() } void SAL_CALL Window::setVisible( sal_Bool bVisible ) - throw (uno::RuntimeException) { if( mnFrameWnd ) { @@ -427,104 +420,87 @@ void SAL_CALL Window::setVisible( sal_Bool bVisible ) } void SAL_CALL Window::setEnable( sal_Bool bEnable ) - throw (uno::RuntimeException) { if( mnFrameWnd ) ::EnableWindow( mnFrameWnd, bEnable ); } void SAL_CALL Window::setFocus( ) - throw (uno::RuntimeException) { if( mnFrameWnd ) ::SetFocus( mnFrameWnd ); } void SAL_CALL Window::addWindowListener( const uno::Reference< awt::XWindowListener >& xListener ) - throw (uno::RuntimeException) { maListeners.addInterface( cppu::UnoType::get(), xListener ); } void SAL_CALL Window::removeWindowListener( const uno::Reference< awt::XWindowListener >& xListener ) - throw (uno::RuntimeException) { maListeners.removeInterface( cppu::UnoType::get(), xListener ); } void SAL_CALL Window::addFocusListener( const uno::Reference< awt::XFocusListener >& xListener ) - throw (uno::RuntimeException) { maListeners.addInterface( cppu::UnoType::get(), xListener ); } void SAL_CALL Window::removeFocusListener( const uno::Reference< awt::XFocusListener >& xListener ) - throw (uno::RuntimeException) { maListeners.removeInterface( cppu::UnoType::get(), xListener ); } void SAL_CALL Window::addKeyListener( const uno::Reference< awt::XKeyListener >& xListener ) - throw (uno::RuntimeException) { maListeners.addInterface( cppu::UnoType::get(), xListener ); } void SAL_CALL Window::removeKeyListener( const uno::Reference< awt::XKeyListener >& xListener ) - throw (uno::RuntimeException) { maListeners.removeInterface( cppu::UnoType::get(), xListener ); } void SAL_CALL Window::addMouseListener( const uno::Reference< awt::XMouseListener >& xListener ) - throw (uno::RuntimeException) { maListeners.addInterface( cppu::UnoType::get(), xListener ); } void SAL_CALL Window::removeMouseListener( const uno::Reference< awt::XMouseListener >& xListener ) - throw (uno::RuntimeException) { maListeners.removeInterface( cppu::UnoType::get(), xListener ); } void SAL_CALL Window::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener ) - throw (uno::RuntimeException) { maListeners.addInterface( cppu::UnoType::get(), xListener ); } void SAL_CALL Window::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener ) - throw (uno::RuntimeException) { maListeners.removeInterface( cppu::UnoType::get(), xListener ); } void SAL_CALL Window::addPaintListener( const uno::Reference< awt::XPaintListener >& xListener ) - throw (uno::RuntimeException) { maListeners.addInterface( cppu::UnoType::get(), xListener ); } void SAL_CALL Window::removePaintListener( const uno::Reference< awt::XPaintListener >& xListener ) - throw (uno::RuntimeException) { maListeners.removeInterface( cppu::UnoType::get(), xListener ); } void SAL_CALL Window::dispose( ) - throw (uno::RuntimeException) { } void SAL_CALL Window::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException) { maListeners.addInterface( cppu::UnoType::get(), xListener ); } void SAL_CALL Window::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException) { maListeners.removeInterface( cppu::UnoType::get(), xListener ); } @@ -582,19 +558,16 @@ void Window::fireSetFocusEvent( const css::awt::FocusEvent& rEvt ) } OUString SAL_CALL Window::getImplementationName( ) - throw (uno::RuntimeException) { return OUString( AVMEDIA_WIN_WINDOW_IMPLEMENTATIONNAME ); } sal_Bool SAL_CALL Window::supportsService( const OUString& ServiceName ) - throw (uno::RuntimeException) { return cppu::supportsService(this, ServiceName); } uno::Sequence< OUString > SAL_CALL Window::getSupportedServiceNames( ) - throw (uno::RuntimeException) { return { AVMEDIA_WIN_WINDOW_SERVICENAME }; } diff --git a/avmedia/source/win/window.hxx b/avmedia/source/win/window.hxx index c034bd0c9f17..141c7abd6b6a 100644 --- a/avmedia/source/win/window.hxx +++ b/avmedia/source/win/window.hxx @@ -51,39 +51,39 @@ public: void updatePointer(); // XPlayerWindow - virtual void SAL_CALL update( ) throw (css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) throw (css::uno::RuntimeException) override; - virtual css::media::ZoomLevel SAL_CALL getZoomLevel( ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) throw (css::uno::RuntimeException) override; + virtual void SAL_CALL update( ) override; + virtual sal_Bool SAL_CALL setZoomLevel( css::media::ZoomLevel ZoomLevel ) override; + virtual css::media::ZoomLevel SAL_CALL getZoomLevel( ) override; + virtual void SAL_CALL setPointerType( sal_Int32 nPointerType ) override; // XWindow - virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) throw (css::uno::RuntimeException) override; - virtual css::awt::Rectangle SAL_CALL getPosSize( ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL setVisible( sal_Bool Visible ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL setEnable( sal_Bool Enable ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL setFocus( ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) throw (css::uno::RuntimeException) override; + virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y, sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) override; + virtual css::awt::Rectangle SAL_CALL getPosSize( ) override; + virtual void SAL_CALL setVisible( sal_Bool Visible ) override; + virtual void SAL_CALL setEnable( sal_Bool Enable ) override; + virtual void SAL_CALL setFocus( ) override; + virtual void SAL_CALL addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override; + virtual void SAL_CALL removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override; + virtual void SAL_CALL addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override; + virtual void SAL_CALL removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override; + virtual void SAL_CALL addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override; + virtual void SAL_CALL removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override; + virtual void SAL_CALL addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override; + virtual void SAL_CALL removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override; + virtual void SAL_CALL addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override; + virtual void SAL_CALL removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override; + virtual void SAL_CALL addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override; + virtual void SAL_CALL removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override; // XComponent - virtual void SAL_CALL dispose( ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException) override; + virtual void SAL_CALL dispose( ) override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; public: diff --git a/basctl/source/accessibility/accessibledialogcontrolshape.cxx b/basctl/source/accessibility/accessibledialogcontrolshape.cxx index ade2d1b2960d..b5ebc70fb57a 100644 --- a/basctl/source/accessibility/accessibledialogcontrolshape.cxx +++ b/basctl/source/accessibility/accessibledialogcontrolshape.cxx @@ -228,7 +228,7 @@ void AccessibleDialogControlShape::FillAccessibleStateSet( utl::AccessibleStateS } // OCommonAccessibleComponent -awt::Rectangle AccessibleDialogControlShape::implGetBounds() throw (RuntimeException, std::exception) +awt::Rectangle AccessibleDialogControlShape::implGetBounds() { return GetBounds(); } @@ -256,7 +256,7 @@ void AccessibleDialogControlShape::disposing() // XEventListener -void AccessibleDialogControlShape::disposing( const lang::EventObject& ) throw (RuntimeException, std::exception) +void AccessibleDialogControlShape::disposing( const lang::EventObject& ) { if ( m_xControlModel.is() ) m_xControlModel->removePropertyChangeListener( OUString(), static_cast< beans::XPropertyChangeListener* >( this ) ); @@ -267,7 +267,7 @@ void AccessibleDialogControlShape::disposing( const lang::EventObject& ) throw ( // XPropertyChangeListener -void AccessibleDialogControlShape::propertyChange( const beans::PropertyChangeEvent& rEvent ) throw (RuntimeException, std::exception) +void AccessibleDialogControlShape::propertyChange( const beans::PropertyChangeEvent& rEvent ) { if ( rEvent.PropertyName == DLGED_PROP_NAME ) { @@ -289,23 +289,23 @@ void AccessibleDialogControlShape::propertyChange( const beans::PropertyChangeEv } // XServiceInfo -OUString AccessibleDialogControlShape::getImplementationName() throw (RuntimeException, std::exception) +OUString AccessibleDialogControlShape::getImplementationName() { return OUString( "com.sun.star.comp.basctl.AccessibleShape" ); } -sal_Bool AccessibleDialogControlShape::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) +sal_Bool AccessibleDialogControlShape::supportsService( const OUString& rServiceName ) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > AccessibleDialogControlShape::getSupportedServiceNames() throw (RuntimeException, std::exception) +Sequence< OUString > AccessibleDialogControlShape::getSupportedServiceNames() { return { "com.sun.star.drawing.AccessibleShape" }; } // XAccessible -Reference< XAccessibleContext > AccessibleDialogControlShape::getAccessibleContext( ) throw (RuntimeException, std::exception) +Reference< XAccessibleContext > AccessibleDialogControlShape::getAccessibleContext( ) { OExternalLockGuard aGuard( this ); @@ -313,7 +313,7 @@ Reference< XAccessibleContext > AccessibleDialogControlShape::getAccessibleConte } // XAccessibleContext -sal_Int32 AccessibleDialogControlShape::getAccessibleChildCount() throw (RuntimeException, std::exception) +sal_Int32 AccessibleDialogControlShape::getAccessibleChildCount() { OExternalLockGuard aGuard( this ); @@ -321,7 +321,7 @@ sal_Int32 AccessibleDialogControlShape::getAccessibleChildCount() throw (Runtime } -Reference< XAccessible > AccessibleDialogControlShape::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XAccessible > AccessibleDialogControlShape::getAccessibleChild( sal_Int32 i ) { OExternalLockGuard aGuard( this ); @@ -332,7 +332,7 @@ Reference< XAccessible > AccessibleDialogControlShape::getAccessibleChild( sal_I } -Reference< XAccessible > AccessibleDialogControlShape::getAccessibleParent( ) throw (RuntimeException, std::exception) +Reference< XAccessible > AccessibleDialogControlShape::getAccessibleParent( ) { OExternalLockGuard aGuard( this ); @@ -344,7 +344,7 @@ Reference< XAccessible > AccessibleDialogControlShape::getAccessibleParent( ) t } -sal_Int32 AccessibleDialogControlShape::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) +sal_Int32 AccessibleDialogControlShape::getAccessibleIndexInParent( ) { OExternalLockGuard aGuard( this ); @@ -375,7 +375,7 @@ sal_Int32 AccessibleDialogControlShape::getAccessibleIndexInParent( ) throw (Ru } -sal_Int16 AccessibleDialogControlShape::getAccessibleRole( ) throw (RuntimeException, std::exception) +sal_Int16 AccessibleDialogControlShape::getAccessibleRole( ) { OExternalLockGuard aGuard( this ); @@ -383,7 +383,7 @@ sal_Int16 AccessibleDialogControlShape::getAccessibleRole( ) throw (RuntimeExce } -OUString AccessibleDialogControlShape::getAccessibleDescription( ) throw (RuntimeException, std::exception) +OUString AccessibleDialogControlShape::getAccessibleDescription( ) { OExternalLockGuard aGuard( this ); @@ -391,7 +391,7 @@ OUString AccessibleDialogControlShape::getAccessibleDescription( ) throw (Runti } -OUString AccessibleDialogControlShape::getAccessibleName( ) throw (RuntimeException, std::exception) +OUString AccessibleDialogControlShape::getAccessibleName( ) { OExternalLockGuard aGuard( this ); @@ -399,7 +399,7 @@ OUString AccessibleDialogControlShape::getAccessibleName( ) throw (RuntimeExcep } -Reference< XAccessibleRelationSet > AccessibleDialogControlShape::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) +Reference< XAccessibleRelationSet > AccessibleDialogControlShape::getAccessibleRelationSet( ) { OExternalLockGuard aGuard( this ); @@ -409,7 +409,7 @@ Reference< XAccessibleRelationSet > AccessibleDialogControlShape::getAccessibleR } -Reference< XAccessibleStateSet > AccessibleDialogControlShape::getAccessibleStateSet( ) throw (RuntimeException, std::exception) +Reference< XAccessibleStateSet > AccessibleDialogControlShape::getAccessibleStateSet( ) { OExternalLockGuard aGuard( this ); @@ -429,7 +429,7 @@ Reference< XAccessibleStateSet > AccessibleDialogControlShape::getAccessibleStat } -Locale AccessibleDialogControlShape::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) +Locale AccessibleDialogControlShape::getLocale( ) { OExternalLockGuard aGuard( this ); @@ -440,7 +440,7 @@ Locale AccessibleDialogControlShape::getLocale( ) throw (IllegalAccessibleCompo // XAccessibleComponent -Reference< XAccessible > AccessibleDialogControlShape::getAccessibleAtPoint( const awt::Point& ) throw (RuntimeException, std::exception) +Reference< XAccessible > AccessibleDialogControlShape::getAccessibleAtPoint( const awt::Point& ) { OExternalLockGuard aGuard( this ); @@ -448,13 +448,13 @@ Reference< XAccessible > AccessibleDialogControlShape::getAccessibleAtPoint( con } -void AccessibleDialogControlShape::grabFocus( ) throw (RuntimeException, std::exception) +void AccessibleDialogControlShape::grabFocus( ) { // no focus for shapes } -sal_Int32 AccessibleDialogControlShape::getForeground( ) throw (RuntimeException, std::exception) +sal_Int32 AccessibleDialogControlShape::getForeground( ) { OExternalLockGuard aGuard( this ); @@ -479,7 +479,7 @@ sal_Int32 AccessibleDialogControlShape::getForeground( ) throw (RuntimeExceptio } -sal_Int32 AccessibleDialogControlShape::getBackground( ) throw (RuntimeException, std::exception) +sal_Int32 AccessibleDialogControlShape::getBackground( ) { OExternalLockGuard aGuard( this ); @@ -500,7 +500,7 @@ sal_Int32 AccessibleDialogControlShape::getBackground( ) throw (RuntimeExceptio // XAccessibleExtendedComponent -Reference< awt::XFont > AccessibleDialogControlShape::getFont( ) throw (RuntimeException, std::exception) +Reference< awt::XFont > AccessibleDialogControlShape::getFont( ) { OExternalLockGuard aGuard( this ); @@ -526,7 +526,7 @@ Reference< awt::XFont > AccessibleDialogControlShape::getFont( ) throw (Runtime } -OUString AccessibleDialogControlShape::getTitledBorderText( ) throw (RuntimeException, std::exception) +OUString AccessibleDialogControlShape::getTitledBorderText( ) { OExternalLockGuard aGuard( this ); @@ -534,7 +534,7 @@ OUString AccessibleDialogControlShape::getTitledBorderText( ) throw (RuntimeExc } -OUString AccessibleDialogControlShape::getToolTipText( ) throw (RuntimeException, std::exception) +OUString AccessibleDialogControlShape::getToolTipText( ) { OExternalLockGuard aGuard( this ); diff --git a/basctl/source/accessibility/accessibledialogwindow.cxx b/basctl/source/accessibility/accessibledialogwindow.cxx index 0d3447a17a1e..333e5ff15c4b 100644 --- a/basctl/source/accessibility/accessibledialogwindow.cxx +++ b/basctl/source/accessibility/accessibledialogwindow.cxx @@ -458,7 +458,7 @@ void AccessibleDialogWindow::FillAccessibleStateSet( utl::AccessibleStateSetHelp // OCommonAccessibleComponent -awt::Rectangle AccessibleDialogWindow::implGetBounds() throw (RuntimeException) +awt::Rectangle AccessibleDialogWindow::implGetBounds() { awt::Rectangle aBounds; if ( m_pDialogWindow ) @@ -573,23 +573,23 @@ void AccessibleDialogWindow::disposing() } // XServiceInfo -OUString AccessibleDialogWindow::getImplementationName() throw (RuntimeException, std::exception) +OUString AccessibleDialogWindow::getImplementationName() { return OUString( "com.sun.star.comp.basctl.AccessibleWindow" ); } -sal_Bool AccessibleDialogWindow::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) +sal_Bool AccessibleDialogWindow::supportsService( const OUString& rServiceName ) { return cppu::supportsService(this, rServiceName); } -Sequence< OUString > AccessibleDialogWindow::getSupportedServiceNames() throw (RuntimeException, std::exception) +Sequence< OUString > AccessibleDialogWindow::getSupportedServiceNames() { return { "com.sun.star.awt.AccessibleWindow" }; } // XAccessible -Reference< XAccessibleContext > AccessibleDialogWindow::getAccessibleContext( ) throw (RuntimeException, std::exception) +Reference< XAccessibleContext > AccessibleDialogWindow::getAccessibleContext( ) { OExternalLockGuard aGuard( this ); @@ -597,7 +597,7 @@ Reference< XAccessibleContext > AccessibleDialogWindow::getAccessibleContext( ) } // XAccessibleContext -sal_Int32 AccessibleDialogWindow::getAccessibleChildCount() throw (RuntimeException, std::exception) +sal_Int32 AccessibleDialogWindow::getAccessibleChildCount() { OExternalLockGuard aGuard( this ); @@ -605,7 +605,7 @@ sal_Int32 AccessibleDialogWindow::getAccessibleChildCount() throw (RuntimeExcept } -Reference< XAccessible > AccessibleDialogWindow::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XAccessible > AccessibleDialogWindow::getAccessibleChild( sal_Int32 i ) { OExternalLockGuard aGuard( this ); @@ -632,7 +632,7 @@ Reference< XAccessible > AccessibleDialogWindow::getAccessibleChild( sal_Int32 i } -Reference< XAccessible > AccessibleDialogWindow::getAccessibleParent( ) throw (RuntimeException, std::exception) +Reference< XAccessible > AccessibleDialogWindow::getAccessibleParent( ) { OExternalLockGuard aGuard( this ); @@ -648,7 +648,7 @@ Reference< XAccessible > AccessibleDialogWindow::getAccessibleParent( ) throw ( } -sal_Int32 AccessibleDialogWindow::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) +sal_Int32 AccessibleDialogWindow::getAccessibleIndexInParent( ) { OExternalLockGuard aGuard( this ); @@ -674,7 +674,7 @@ sal_Int32 AccessibleDialogWindow::getAccessibleIndexInParent( ) throw (RuntimeE } -sal_Int16 AccessibleDialogWindow::getAccessibleRole( ) throw (RuntimeException, std::exception) +sal_Int16 AccessibleDialogWindow::getAccessibleRole( ) { OExternalLockGuard aGuard( this ); @@ -682,7 +682,7 @@ sal_Int16 AccessibleDialogWindow::getAccessibleRole( ) throw (RuntimeException, } -OUString AccessibleDialogWindow::getAccessibleDescription( ) throw (RuntimeException, std::exception) +OUString AccessibleDialogWindow::getAccessibleDescription( ) { OExternalLockGuard aGuard( this ); @@ -694,7 +694,7 @@ OUString AccessibleDialogWindow::getAccessibleDescription( ) throw (RuntimeExce } -OUString AccessibleDialogWindow::getAccessibleName( ) throw (RuntimeException, std::exception) +OUString AccessibleDialogWindow::getAccessibleName( ) { OExternalLockGuard aGuard( this ); @@ -706,7 +706,7 @@ OUString AccessibleDialogWindow::getAccessibleName( ) throw (RuntimeException, } -Reference< XAccessibleRelationSet > AccessibleDialogWindow::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) +Reference< XAccessibleRelationSet > AccessibleDialogWindow::getAccessibleRelationSet( ) { OExternalLockGuard aGuard( this ); @@ -716,7 +716,7 @@ Reference< XAccessibleRelationSet > AccessibleDialogWindow::getAccessibleRelatio } -Reference< XAccessibleStateSet > AccessibleDialogWindow::getAccessibleStateSet( ) throw (RuntimeException, std::exception) +Reference< XAccessibleStateSet > AccessibleDialogWindow::getAccessibleStateSet( ) { OExternalLockGuard aGuard( this ); @@ -736,7 +736,7 @@ Reference< XAccessibleStateSet > AccessibleDialogWindow::getAccessibleStateSet( } -Locale AccessibleDialogWindow::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) +Locale AccessibleDialogWindow::getLocale( ) { OExternalLockGuard aGuard( this ); @@ -747,7 +747,7 @@ Locale AccessibleDialogWindow::getLocale( ) throw (IllegalAccessibleComponentSt // XAccessibleComponent -Reference< XAccessible > AccessibleDialogWindow::getAccessibleAtPoint( const awt::Point& rPoint ) throw (RuntimeException, std::exception) +Reference< XAccessible > AccessibleDialogWindow::getAccessibleAtPoint( const awt::Point& rPoint ) { OExternalLockGuard aGuard( this ); @@ -775,7 +775,7 @@ Reference< XAccessible > AccessibleDialogWindow::getAccessibleAtPoint( const awt } -void AccessibleDialogWindow::grabFocus( ) throw (RuntimeException, std::exception) +void AccessibleDialogWindow::grabFocus( ) { OExternalLockGuard aGuard( this ); @@ -784,7 +784,7 @@ void AccessibleDialogWindow::grabFocus( ) throw (RuntimeException, std::excepti } -sal_Int32 AccessibleDialogWindow::getForeground( ) throw (RuntimeException, std::exception) +sal_Int32 AccessibleDialogWindow::getForeground( ) { OExternalLockGuard aGuard( this ); @@ -808,7 +808,7 @@ sal_Int32 AccessibleDialogWindow::getForeground( ) throw (RuntimeException, std } -sal_Int32 AccessibleDialogWindow::getBackground( ) throw (RuntimeException, std::exception) +sal_Int32 AccessibleDialogWindow::getBackground( ) { OExternalLockGuard aGuard( this ); @@ -828,7 +828,7 @@ sal_Int32 AccessibleDialogWindow::getBackground( ) throw (RuntimeException, std // XAccessibleExtendedComponent -Reference< awt::XFont > AccessibleDialogWindow::getFont( ) throw (RuntimeException, std::exception) +Reference< awt::XFont > AccessibleDialogWindow::getFont( ) { OExternalLockGuard aGuard( this ); @@ -853,7 +853,7 @@ Reference< awt::XFont > AccessibleDialogWindow::getFont( ) throw (RuntimeExcept } -OUString AccessibleDialogWindow::getTitledBorderText( ) throw (RuntimeException, std::exception) +OUString AccessibleDialogWindow::getTitledBorderText( ) { OExternalLockGuard aGuard( this ); @@ -861,7 +861,7 @@ OUString AccessibleDialogWindow::getTitledBorderText( ) throw (RuntimeException } -OUString AccessibleDialogWindow::getToolTipText( ) throw (RuntimeException, std::exception) +OUString AccessibleDialogWindow::getToolTipText( ) { OExternalLockGuard aGuard( this ); @@ -876,7 +876,7 @@ OUString AccessibleDialogWindow::getToolTipText( ) throw (RuntimeException, std // XAccessibleSelection -void AccessibleDialogWindow::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +void AccessibleDialogWindow::selectAccessibleChild( sal_Int32 nChildIndex ) { OExternalLockGuard aGuard( this ); @@ -895,7 +895,7 @@ void AccessibleDialogWindow::selectAccessibleChild( sal_Int32 nChildIndex ) thro } -sal_Bool AccessibleDialogWindow::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +sal_Bool AccessibleDialogWindow::isAccessibleChildSelected( sal_Int32 nChildIndex ) { OExternalLockGuard aGuard( this ); @@ -910,7 +910,6 @@ sal_Bool AccessibleDialogWindow::isAccessibleChildSelected( sal_Int32 nChildInde void AccessibleDialogWindow::clearAccessibleSelection() - throw (RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); @@ -919,7 +918,7 @@ void AccessibleDialogWindow::clearAccessibleSelection() } -void AccessibleDialogWindow::selectAllAccessibleChildren( ) throw (RuntimeException, std::exception) +void AccessibleDialogWindow::selectAllAccessibleChildren( ) { OExternalLockGuard aGuard( this ); @@ -928,7 +927,7 @@ void AccessibleDialogWindow::selectAllAccessibleChildren( ) throw (RuntimeExcep } -sal_Int32 AccessibleDialogWindow::getSelectedAccessibleChildCount( ) throw (RuntimeException, std::exception) +sal_Int32 AccessibleDialogWindow::getSelectedAccessibleChildCount( ) { OExternalLockGuard aGuard( this ); @@ -944,7 +943,7 @@ sal_Int32 AccessibleDialogWindow::getSelectedAccessibleChildCount( ) throw (Run } -Reference< XAccessible > AccessibleDialogWindow::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +Reference< XAccessible > AccessibleDialogWindow::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) { OExternalLockGuard aGuard( this ); @@ -966,7 +965,7 @@ Reference< XAccessible > AccessibleDialogWindow::getSelectedAccessibleChild( sal } -void AccessibleDialogWindow::deselectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) +void AccessibleDialogWindow::deselectAccessibleChild( sal_Int32 nChildIndex ) { OExternalLockGuard aGuard( this ); diff --git a/basctl/source/basicide/basicrenderable.cxx b/basctl/source/basicide/basicrenderable.cxx index d1b7bced581d..3af2ee9ef9f9 100644 --- a/basctl/source/basicide/basicrenderable.cxx +++ b/basctl/source/basicide/basicrenderable.cxx @@ -86,7 +86,7 @@ VclPtr< Printer > Renderable::getPrinter() sal_Int32 SAL_CALL Renderable::getRendererCount ( const Any&, const Sequence& i_xOptions - ) throw (lang::IllegalArgumentException, RuntimeException, std::exception) + ) { processProperties( i_xOptions ); @@ -118,7 +118,7 @@ sal_Int32 SAL_CALL Renderable::getRendererCount ( Sequence SAL_CALL Renderable::getRenderer ( sal_Int32, const Any&, const Sequence& i_xOptions - ) throw (lang::IllegalArgumentException, RuntimeException, std::exception) + ) { processProperties( i_xOptions ); @@ -146,7 +146,7 @@ Sequence SAL_CALL Renderable::getRenderer ( void SAL_CALL Renderable::render ( sal_Int32 nRenderer, const Any&, const Sequence& i_xOptions - ) throw (lang::IllegalArgumentException, RuntimeException, std::exception) + ) { processProperties( i_xOptions ); diff --git a/basctl/source/basicide/basicrenderable.hxx b/basctl/source/basicide/basicrenderable.hxx index c2bfce9fde94..412480609f0c 100644 --- a/basctl/source/basicide/basicrenderable.hxx +++ b/basctl/source/basicide/basicrenderable.hxx @@ -44,20 +44,17 @@ public: // XRenderable virtual sal_Int32 SAL_CALL getRendererCount ( const css::uno::Any& aSelection, - const css::uno::Sequence& xOptions) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence& xOptions) override; virtual css::uno::Sequence SAL_CALL getRenderer ( sal_Int32 nRenderer, const css::uno::Any& rSelection, - const css::uno::Sequence& rxOptions) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence& rxOptions) override; virtual void SAL_CALL render ( sal_Int32 nRenderer, const css::uno::Any& rSelection, - const css::uno::Sequence& rxOptions) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence& rxOptions) override; }; diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx index bd0b4cff2249..977d827f8230 100644 --- a/basctl/source/basicide/baside2b.cxx +++ b/basctl/source/basicide/baside2b.cxx @@ -183,14 +183,14 @@ public: private: virtual ~ChangesListener() override {} - virtual void SAL_CALL disposing(lang::EventObject const &) throw (RuntimeException, std::exception) override + virtual void SAL_CALL disposing(lang::EventObject const &) override { osl::MutexGuard g(editor_.mutex_); editor_.notifier_.clear(); } virtual void SAL_CALL propertiesChange( - Sequence< beans::PropertyChangeEvent > const &) throw (RuntimeException, std::exception) override + Sequence< beans::PropertyChangeEvent > const &) override { SolarMutexGuard g; editor_.ImplSetFont(); diff --git a/basctl/source/basicide/basidectrlr.cxx b/basctl/source/basicide/basidectrlr.cxx index 3dea60f64b22..7fa89a717dc6 100644 --- a/basctl/source/basicide/basidectrlr.cxx +++ b/basctl/source/basicide/basidectrlr.cxx @@ -56,7 +56,7 @@ Controller::~Controller() { } // XInterface -Any SAL_CALL Controller::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL Controller::queryInterface( const Type & rType ) { Any aReturn = SfxBaseController::queryInterface( rType ); if ( !aReturn.hasValue() ) @@ -76,7 +76,7 @@ void SAL_CALL Controller::release() throw() } // XTypeProvider ( ::SfxBaseController ) -Sequence< Type > SAL_CALL Controller::getTypes() throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL Controller::getTypes() { Sequence< Type > aTypes = ::comphelper::concatSequences( SfxBaseController::getTypes(), @@ -86,13 +86,13 @@ Sequence< Type > SAL_CALL Controller::getTypes() throw(RuntimeException, std::ex return aTypes; } -Sequence< sal_Int8 > SAL_CALL Controller::getImplementationId() throw(RuntimeException, std::exception) +Sequence< sal_Int8 > SAL_CALL Controller::getImplementationId() { return css::uno::Sequence(); } // XPropertySet -Reference< beans::XPropertySetInfo > SAL_CALL Controller::getPropertySetInfo() throw(RuntimeException, std::exception) +Reference< beans::XPropertySetInfo > SAL_CALL Controller::getPropertySetInfo() { Reference< beans::XPropertySetInfo > xInfo( createPropertySetInfo( getInfoHelper() ) ); return xInfo; diff --git a/basctl/source/basicide/basidesh.cxx b/basctl/source/basicide/basidesh.cxx index 8e7ddc17e9b4..09aa70fb0536 100644 --- a/basctl/source/basicide/basidesh.cxx +++ b/basctl/source/basicide/basidesh.cxx @@ -109,17 +109,17 @@ public: } // XEventListener - virtual void SAL_CALL disposing( const lang::EventObject& ) throw( uno::RuntimeException, std::exception ) override {} + virtual void SAL_CALL disposing( const lang::EventObject& ) override {} // XContainerListener - virtual void SAL_CALL elementInserted( const container::ContainerEvent& Event ) throw( uno::RuntimeException, std::exception ) override + virtual void SAL_CALL elementInserted( const container::ContainerEvent& Event ) override { OUString sModuleName; if( mpShell && ( Event.Accessor >>= sModuleName ) ) mpShell->FindBasWin( mpShell->m_aCurDocument, mpShell->m_aCurLibName, sModuleName, true ); } - virtual void SAL_CALL elementReplaced( const container::ContainerEvent& ) throw( css::uno::RuntimeException, std::exception ) override { } - virtual void SAL_CALL elementRemoved( const container::ContainerEvent& Event ) throw( css::uno::RuntimeException, std::exception ) override + virtual void SAL_CALL elementReplaced( const container::ContainerEvent& ) override { } + virtual void SAL_CALL elementRemoved( const container::ContainerEvent& Event ) override { OUString sModuleName; if( mpShell && ( Event.Accessor >>= sModuleName ) ) diff --git a/basctl/source/basicide/basobj2.cxx b/basctl/source/basicide/basobj2.cxx index 0d8b7d23e71f..ae859336ee64 100644 --- a/basctl/source/basicide/basobj2.cxx +++ b/basctl/source/basicide/basobj2.cxx @@ -358,7 +358,6 @@ OUString ChooseMacro( const uno::Reference< frame::XModel >& rxLimitToDocument, } Sequence< OUString > GetMethodNames( const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rModName ) - throw (NoSuchElementException, RuntimeException, std::exception) { Sequence< OUString > aSeqMethods; diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx index f3cdc49b6a70..d1bd544b5bc7 100644 --- a/basctl/source/basicide/basobj3.cxx +++ b/basctl/source/basicide/basobj3.cxx @@ -134,7 +134,6 @@ bool RenameDialog ( OUString const& rOldName, OUString const& rNewName ) - throw (ElementExistException, NoSuchElementException, RuntimeException, std::exception) { if ( !rDocument.hasDialog( rLibName, rOldName ) ) { diff --git a/basctl/source/basicide/doceventnotifier.cxx b/basctl/source/basicide/doceventnotifier.cxx index 3b4f345138d4..90e55e00ee18 100644 --- a/basctl/source/basicide/doceventnotifier.cxx +++ b/basctl/source/basicide/doceventnotifier.cxx @@ -73,10 +73,10 @@ namespace basctl virtual ~Impl () override; // XDocumentEventListener - virtual void SAL_CALL documentEventOccured( const DocumentEvent& Event ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL documentEventOccured( const DocumentEvent& Event ) override; // XEventListener - virtual void SAL_CALL disposing( const csslang::EventObject& Event ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const csslang::EventObject& Event ) override; // ComponentHelper virtual void SAL_CALL disposing() override; @@ -115,7 +115,7 @@ namespace basctl } } - void SAL_CALL DocumentEventNotifier::Impl::documentEventOccured( const DocumentEvent& _rEvent ) throw (RuntimeException, std::exception) + void SAL_CALL DocumentEventNotifier::Impl::documentEventOccured( const DocumentEvent& _rEvent ) { ::osl::ClearableMutexGuard aGuard( m_aMutex ); @@ -168,7 +168,7 @@ namespace basctl } } - void SAL_CALL DocumentEventNotifier::Impl::disposing( const csslang::EventObject& /*Event*/ ) throw (RuntimeException, std::exception) + void SAL_CALL DocumentEventNotifier::Impl::disposing( const csslang::EventObject& /*Event*/ ) { SolarMutexGuard aSolarGuard; ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index 43c8dc012ecd..3e7842aea543 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -80,7 +80,7 @@ public: { } - virtual void SAL_CALL handle( const Reference< task::XInteractionRequest >& rRequest ) throw (css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL handle( const Reference< task::XInteractionRequest >& rRequest ) override { if ( m_xHandler.is() ) { @@ -1154,20 +1154,16 @@ public: {} // Methods - virtual Reference< task::XInteractionHandler > SAL_CALL getInteractionHandler() - throw(RuntimeException, std::exception) override; - virtual Reference< XProgressHandler > SAL_CALL getProgressHandler() - throw(RuntimeException, std::exception) override; + virtual Reference< task::XInteractionHandler > SAL_CALL getInteractionHandler() override; + virtual Reference< XProgressHandler > SAL_CALL getProgressHandler() override; }; Reference< task::XInteractionHandler > OLibCommandEnvironment::getInteractionHandler() - throw(RuntimeException, std::exception) { return mxInteraction; } Reference< XProgressHandler > OLibCommandEnvironment::getProgressHandler() - throw(RuntimeException, std::exception) { Reference< XProgressHandler > xRet; return xRet; diff --git a/basctl/source/basicide/unomodel.cxx b/basctl/source/basicide/unomodel.cxx index 5cceb2a599c5..ca255657f8c8 100644 --- a/basctl/source/basicide/unomodel.cxx +++ b/basctl/source/basicide/unomodel.cxx @@ -43,7 +43,7 @@ SIDEModel::~SIDEModel() { } -uno::Any SAL_CALL SIDEModel::queryInterface( const uno::Type& rType ) throw(uno::RuntimeException, std::exception) +uno::Any SAL_CALL SIDEModel::queryInterface( const uno::Type& rType ) { uno::Any aRet = ::cppu::queryInterface ( rType, // OWeakObject interfaces @@ -67,7 +67,7 @@ void SAL_CALL SIDEModel::release() throw() OWeakObject::release(); } -uno::Sequence< uno::Type > SAL_CALL SIDEModel::getTypes( ) throw(uno::RuntimeException, std::exception) +uno::Sequence< uno::Type > SAL_CALL SIDEModel::getTypes( ) { uno::Sequence< uno::Type > aTypes = SfxBaseModel::getTypes(); sal_Int32 nLen = aTypes.getLength(); @@ -78,7 +78,7 @@ uno::Sequence< uno::Type > SAL_CALL SIDEModel::getTypes( ) throw(uno::RuntimeEx return aTypes; } -OUString SIDEModel::getImplementationName() throw( uno::RuntimeException, std::exception ) +OUString SIDEModel::getImplementationName() { return getImplementationName_Static(); } @@ -88,11 +88,11 @@ OUString SIDEModel::getImplementationName_Static() return OUString( "com.sun.star.comp.basic.BasicIDE" ); } -sal_Bool SIDEModel::supportsService(const OUString& rServiceName) throw( uno::RuntimeException, std::exception ) +sal_Bool SIDEModel::supportsService(const OUString& rServiceName) { return cppu::supportsService(this, rServiceName); } -uno::Sequence< OUString > SIDEModel::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SIDEModel::getSupportedServiceNames() { return getSupportedServiceNames_Static(); } @@ -103,7 +103,7 @@ uno::Sequence< OUString > SIDEModel::getSupportedServiceNames_Static() } uno::Reference< uno::XInterface > SAL_CALL SIDEModel_createInstance( - const uno::Reference< lang::XMultiServiceFactory > & ) throw( uno::Exception ) + const uno::Reference< lang::XMultiServiceFactory > & ) { SolarMutexGuard aGuard; EnsureIde(); @@ -112,25 +112,23 @@ uno::Reference< uno::XInterface > SAL_CALL SIDEModel_createInstance( } // XStorable -void SAL_CALL SIDEModel::store() throw (io::IOException, uno::RuntimeException, std::exception) +void SAL_CALL SIDEModel::store() { notImplemented(); } void SAL_CALL SIDEModel::storeAsURL( const OUString&, const uno::Sequence< beans::PropertyValue >& ) - throw (io::IOException, uno::RuntimeException, std::exception) { notImplemented(); } void SAL_CALL SIDEModel::storeToURL( const OUString&, const uno::Sequence< beans::PropertyValue >& ) - throw (io::IOException, uno::RuntimeException, std::exception) { notImplemented(); } -void SIDEModel::notImplemented() throw ( io::IOException ) +void SIDEModel::notImplemented() { throw io::IOException("Can't store IDE model" ); } diff --git a/basctl/source/basicide/unomodel.hxx b/basctl/source/basicide/unomodel.hxx index baea50903f83..e4d92351347a 100644 --- a/basctl/source/basicide/unomodel.hxx +++ b/basctl/source/basicide/unomodel.hxx @@ -29,37 +29,31 @@ class SIDEModel : public SfxBaseModel, public com::sun::star::lang::XServiceInfo { /// @throws css::io::IOException - static void notImplemented() throw ( css::io::IOException ); + static void notImplemented(); public: explicit SIDEModel(SfxObjectShell *pObjSh = nullptr); virtual ~SIDEModel() override; //XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; virtual void SAL_CALL acquire( ) throw() override; virtual void SAL_CALL release( ) throw() override; //XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XStorable2 - virtual void SAL_CALL storeSelf( const css::uno::Sequence< css::beans::PropertyValue >& ) - throw (css::lang::IllegalArgumentException, css::io::IOException, css::uno::RuntimeException, std::exception) override { notImplemented(); } + virtual void SAL_CALL storeSelf( const css::uno::Sequence< css::beans::PropertyValue >& ) override { notImplemented(); } // XStorable - virtual void SAL_CALL store() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL store() override; virtual void SAL_CALL storeAsURL( const OUString& sURL, - const css::uno::Sequence< css::beans::PropertyValue >& seqArguments ) - throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& seqArguments ) override; virtual void SAL_CALL storeToURL( const OUString& sURL, - const css::uno::Sequence< css::beans::PropertyValue >& seqArguments ) - throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& seqArguments ) override; static css::uno::Sequence< OUString > getSupportedServiceNames_Static(); static OUString getImplementationName_Static(); @@ -67,8 +61,7 @@ public: /// @throws com::sun::star::uno::Exception css::uno::Reference< css::uno::XInterface > SAL_CALL SIDEModel_createInstance( - const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ) - throw( com::sun::star::uno::Exception ); + const css::uno::Reference< css::lang::XMultiServiceFactory > & rSMgr ); } // namespace basctl diff --git a/basctl/source/dlged/dlgedclip.cxx b/basctl/source/dlged/dlgedclip.cxx index b6d91bf7ad7c..1d97b4cc94ef 100644 --- a/basctl/source/dlged/dlgedclip.cxx +++ b/basctl/source/dlged/dlgedclip.cxx @@ -61,7 +61,7 @@ bool DlgEdTransferableImpl::compareDataFlavors( const DataFlavor& lFlavor, const } // XTransferable -Any SAL_CALL DlgEdTransferableImpl::getTransferData( const DataFlavor& rFlavor ) throw(UnsupportedFlavorException, IOException, RuntimeException, std::exception) +Any SAL_CALL DlgEdTransferableImpl::getTransferData( const DataFlavor& rFlavor ) { const SolarMutexGuard aGuard; @@ -81,13 +81,13 @@ Any SAL_CALL DlgEdTransferableImpl::getTransferData( const DataFlavor& rFlavor ) return aData; } -Sequence< DataFlavor > SAL_CALL DlgEdTransferableImpl::getTransferDataFlavors( ) throw(RuntimeException, std::exception) +Sequence< DataFlavor > SAL_CALL DlgEdTransferableImpl::getTransferDataFlavors( ) { const SolarMutexGuard aGuard; return m_SeqFlavors; } -sal_Bool SAL_CALL DlgEdTransferableImpl::isDataFlavorSupported( const DataFlavor& rFlavor ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL DlgEdTransferableImpl::isDataFlavorSupported( const DataFlavor& rFlavor ) { const SolarMutexGuard aGuard; @@ -98,7 +98,7 @@ sal_Bool SAL_CALL DlgEdTransferableImpl::isDataFlavorSupported( const DataFlavor } // XClipboardOwner -void SAL_CALL DlgEdTransferableImpl::lostOwnership( const Reference< XClipboard >&, const Reference< XTransferable >& ) throw(RuntimeException, std::exception) +void SAL_CALL DlgEdTransferableImpl::lostOwnership( const Reference< XClipboard >&, const Reference< XTransferable >& ) { const SolarMutexGuard aGuard; diff --git a/basctl/source/dlged/dlgedlist.cxx b/basctl/source/dlged/dlgedlist.cxx index f94774998ae8..8cda02a4520e 100644 --- a/basctl/source/dlged/dlgedlist.cxx +++ b/basctl/source/dlged/dlgedlist.cxx @@ -34,12 +34,12 @@ DlgEdPropListenerImpl::~DlgEdPropListenerImpl() } // XEventListener -void SAL_CALL DlgEdPropListenerImpl::disposing( const css::lang::EventObject& ) throw( css::uno::RuntimeException, std::exception) +void SAL_CALL DlgEdPropListenerImpl::disposing( const css::lang::EventObject& ) { } // XPropertyChangeListener -void SAL_CALL DlgEdPropListenerImpl::propertyChange( const css::beans::PropertyChangeEvent& evt ) throw( css::uno::RuntimeException, std::exception) +void SAL_CALL DlgEdPropListenerImpl::propertyChange( const css::beans::PropertyChangeEvent& evt ) { rDlgEdObj._propertyChange( evt ); } @@ -55,22 +55,22 @@ DlgEdEvtContListenerImpl::~DlgEdEvtContListenerImpl() } // XEventListener -void SAL_CALL DlgEdEvtContListenerImpl::disposing( const css::lang::EventObject& ) throw( css::uno::RuntimeException, std::exception) +void SAL_CALL DlgEdEvtContListenerImpl::disposing( const css::lang::EventObject& ) { } // XContainerListener -void SAL_CALL DlgEdEvtContListenerImpl::elementInserted(const css::container::ContainerEvent& Event) throw(css::uno::RuntimeException, std::exception) +void SAL_CALL DlgEdEvtContListenerImpl::elementInserted(const css::container::ContainerEvent& Event) { rDlgEdObj._elementInserted( Event ); } -void SAL_CALL DlgEdEvtContListenerImpl::elementReplaced(const css::container::ContainerEvent& Event) throw(css::uno::RuntimeException, std::exception) +void SAL_CALL DlgEdEvtContListenerImpl::elementReplaced(const css::container::ContainerEvent& Event) { rDlgEdObj._elementReplaced( Event ); } -void SAL_CALL DlgEdEvtContListenerImpl::elementRemoved(const css::container::ContainerEvent& Event) throw(css::uno::RuntimeException, std::exception) +void SAL_CALL DlgEdEvtContListenerImpl::elementRemoved(const css::container::ContainerEvent& Event) { rDlgEdObj._elementRemoved( Event ); } diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx index a8dd5625cf58..7b839c3fcb34 100644 --- a/basctl/source/dlged/dlgedobj.cxx +++ b/basctl/source/dlged/dlgedobj.cxx @@ -439,7 +439,7 @@ void DlgEdObj::PositionAndSizeChange( const beans::PropertyChangeEvent& evt ) SetRectFromProps(); } -void SAL_CALL DlgEdObj::NameChange( const css::beans::PropertyChangeEvent& evt ) throw (css::container::NoSuchElementException, css::uno::RuntimeException) +void SAL_CALL DlgEdObj::NameChange( const css::beans::PropertyChangeEvent& evt ) { // get old name OUString aOldName; @@ -521,7 +521,7 @@ void DlgEdObj::UpdateStep() } } -void DlgEdObj::TabIndexChange( const beans::PropertyChangeEvent& evt ) throw (RuntimeException) +void DlgEdObj::TabIndexChange( const beans::PropertyChangeEvent& evt ) { DlgEdForm* pForm = GetDlgEdForm(); if ( pForm ) @@ -1095,7 +1095,7 @@ void DlgEdObj::EndListening(bool bRemoveListener) } } -void SAL_CALL DlgEdObj::_propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL DlgEdObj::_propertyChange( const css::beans::PropertyChangeEvent& evt ) { if (isListening()) { @@ -1151,7 +1151,7 @@ void SAL_CALL DlgEdObj::_propertyChange( const css::beans::PropertyChangeEvent& } } -void SAL_CALL DlgEdObj::_elementInserted(const css::container::ContainerEvent& ) throw(css::uno::RuntimeException) +void SAL_CALL DlgEdObj::_elementInserted(const css::container::ContainerEvent& ) { if (isListening()) { @@ -1160,7 +1160,7 @@ void SAL_CALL DlgEdObj::_elementInserted(const css::container::ContainerEvent& ) } } -void SAL_CALL DlgEdObj::_elementReplaced(const css::container::ContainerEvent& ) throw(css::uno::RuntimeException) +void SAL_CALL DlgEdObj::_elementReplaced(const css::container::ContainerEvent& ) { if (isListening()) { @@ -1169,7 +1169,7 @@ void SAL_CALL DlgEdObj::_elementReplaced(const css::container::ContainerEvent& ) } } -void SAL_CALL DlgEdObj::_elementRemoved(const css::container::ContainerEvent& ) throw(css::uno::RuntimeException) +void SAL_CALL DlgEdObj::_elementRemoved(const css::container::ContainerEvent& ) { if (isListening()) { diff --git a/basctl/source/inc/accessibledialogcontrolshape.hxx b/basctl/source/inc/accessibledialogcontrolshape.hxx index 3571bd2692d0..ffdf0217c3f6 100644 --- a/basctl/source/inc/accessibledialogcontrolshape.hxx +++ b/basctl/source/inc/accessibledialogcontrolshape.hxx @@ -79,7 +79,7 @@ protected: void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); // OCommonAccessibleComponent - virtual css::awt::Rectangle implGetBounds() throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle implGetBounds() override; // XComponent virtual void SAL_CALL disposing() override; @@ -95,41 +95,41 @@ public: DECLARE_XTYPEPROVIDER() // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& rSource ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& rSource ) override; // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& rEvent ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& rEvent ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XAccessible - virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) override; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::lang::Locale SAL_CALL getLocale( ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) override; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) override; + virtual OUString SAL_CALL getAccessibleDescription( ) override; + virtual OUString SAL_CALL getAccessibleName( ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) override; + virtual css::lang::Locale SAL_CALL getLocale( ) override; // XAccessibleComponent - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grabFocus( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override; + virtual void SAL_CALL grabFocus( ) override; + virtual sal_Int32 SAL_CALL getForeground( ) override; + virtual sal_Int32 SAL_CALL getBackground( ) override; // XAccessibleExtendedComponent - virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTitledBorderText( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getToolTipText( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) override; + virtual OUString SAL_CALL getTitledBorderText( ) override; + virtual OUString SAL_CALL getToolTipText( ) override; }; } // namespace basctl diff --git a/basctl/source/inc/accessibledialogwindow.hxx b/basctl/source/inc/accessibledialogwindow.hxx index 1da0a2f905f0..bc87d60e2b0a 100644 --- a/basctl/source/inc/accessibledialogwindow.hxx +++ b/basctl/source/inc/accessibledialogwindow.hxx @@ -101,7 +101,7 @@ protected: void FillAccessibleStateSet( utl::AccessibleStateSetHelper& rStateSet ); // OCommonAccessibleComponent - virtual css::awt::Rectangle implGetBounds( ) throw (css::uno::RuntimeException) override; + virtual css::awt::Rectangle implGetBounds( ) override; // XComponent virtual void SAL_CALL disposing() override; @@ -120,46 +120,44 @@ public: DECLARE_XTYPEPROVIDER() // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& rServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XAccessible - virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext( ) override; // XAccessibleContext - virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getAccessibleRole( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleDescription( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::lang::Locale SAL_CALL getLocale( ) throw (css::accessibility::IllegalAccessibleComponentStateException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount( ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( sal_Int32 i ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent( ) override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent( ) override; + virtual sal_Int16 SAL_CALL getAccessibleRole( ) override; + virtual OUString SAL_CALL getAccessibleDescription( ) override; + virtual OUString SAL_CALL getAccessibleName( ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet( ) override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet( ) override; + virtual css::lang::Locale SAL_CALL getLocale( ) override; // XAccessibleComponent - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grabFocus( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getForeground( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getBackground( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override; + virtual void SAL_CALL grabFocus( ) override; + virtual sal_Int32 SAL_CALL getForeground( ) override; + virtual sal_Int32 SAL_CALL getBackground( ) override; // XAccessibleExtendedComponent - virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTitledBorderText( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getToolTipText( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont( ) override; + virtual OUString SAL_CALL getTitledBorderText( ) override; + virtual OUString SAL_CALL getToolTipText( ) override; // XAccessibleSelection - virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearAccessibleSelection() - throw (css::uno::RuntimeException, - std::exception) override; - virtual void SAL_CALL selectAllAccessibleChildren( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) override; + virtual sal_Bool SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) override; + virtual void SAL_CALL clearAccessibleSelection() override; + virtual void SAL_CALL selectAllAccessibleChildren( ) override; + virtual sal_Int32 SAL_CALL getSelectedAccessibleChildCount( ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) override; + virtual void SAL_CALL deselectAccessibleChild( sal_Int32 nChildIndex ) override; }; } // namespace basctl diff --git a/basctl/source/inc/basidectrlr.hxx b/basctl/source/inc/basidectrlr.hxx index 61f474fc9d7e..76049a5b3f37 100644 --- a/basctl/source/inc/basidectrlr.hxx +++ b/basctl/source/inc/basidectrlr.hxx @@ -45,16 +45,16 @@ public: virtual ~Controller() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider ( ::SfxBaseController ) - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes() override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() override; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; // OPropertySetHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; diff --git a/basctl/source/inc/basobj.hxx b/basctl/source/inc/basobj.hxx index 91bc5507c96d..9ebbe0f949b8 100644 --- a/basctl/source/inc/basobj.hxx +++ b/basctl/source/inc/basobj.hxx @@ -84,8 +84,7 @@ namespace basctl /// @throws css::container::NoSuchElementException /// @throws css::uno::RuntimeException css::uno::Sequence< OUString > GetMethodNames( - const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rModName ) - throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception); + const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rModName ); bool HasMethod( const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rModName, const OUString& rMethName ); @@ -101,8 +100,7 @@ namespace basctl @throws css::uno::RuntimeException */ bool RenameDialog( - vcl::Window* pErrorParent, const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rOldName, const OUString& rNewName ) - throw (css::container::ElementExistException, css::container::NoSuchElementException, css::uno::RuntimeException, std::exception); + vcl::Window* pErrorParent, const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rOldName, const OUString& rNewName ); bool RemoveDialog( const ScriptDocument& rDocument, const OUString& rLibName, const OUString& rDlgName ); diff --git a/basctl/source/inc/dlgedclip.hxx b/basctl/source/inc/dlgedclip.hxx index 30f24ada0ac5..ef2f4c0fb7cb 100644 --- a/basctl/source/inc/dlgedclip.hxx +++ b/basctl/source/inc/dlgedclip.hxx @@ -42,12 +42,12 @@ public: virtual ~DlgEdTransferableImpl() override; // XTransferable - virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& rFlavor ) throw(css::datatransfer::UnsupportedFlavorException, css::io::IOException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors() throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& rFlavor ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& rFlavor ) override; + virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors() override; + virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& rFlavor ) override; // XClipboardOwner - virtual void SAL_CALL lostOwnership( const css::uno::Reference< css::datatransfer::clipboard::XClipboard >& xClipboard, const css::uno::Reference< css::datatransfer::XTransferable >& xTrans ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL lostOwnership( const css::uno::Reference< css::datatransfer::clipboard::XClipboard >& xClipboard, const css::uno::Reference< css::datatransfer::XTransferable >& xTrans ) override; }; } // namespace basctl diff --git a/basctl/source/inc/dlgedlist.hxx b/basctl/source/inc/dlgedlist.hxx index e803e852df60..a11e46087312 100644 --- a/basctl/source/inc/dlgedlist.hxx +++ b/basctl/source/inc/dlgedlist.hxx @@ -45,10 +45,10 @@ public: virtual ~DlgEdPropListenerImpl() override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) override; }; @@ -68,12 +68,12 @@ public: virtual ~DlgEdEvtContListenerImpl() override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; // XContainerListener - virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& Event ) override; + virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) override; + virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) override; }; } // namespace basctl diff --git a/basctl/source/inc/dlgedobj.hxx b/basctl/source/inc/dlgedobj.hxx index 34393d42332e..f88423976450 100644 --- a/basctl/source/inc/dlgedobj.hxx +++ b/basctl/source/inc/dlgedobj.hxx @@ -117,21 +117,21 @@ public: virtual void PositionAndSizeChange( const css::beans::PropertyChangeEvent& evt ); /// @throws css::container::NoSuchElementException /// @throws css::uno::RuntimeException - void SAL_CALL NameChange( const css::beans::PropertyChangeEvent& evt ) throw(css::container::NoSuchElementException, css::uno::RuntimeException); + void SAL_CALL NameChange( const css::beans::PropertyChangeEvent& evt ); /// @throws css::uno::RuntimeException - void SAL_CALL TabIndexChange( const css::beans::PropertyChangeEvent& evt ) throw( css::uno::RuntimeException); + void SAL_CALL TabIndexChange( const css::beans::PropertyChangeEvent& evt ); // PropertyChangeListener /// @throws css::uno::RuntimeException - void SAL_CALL _propertyChange(const css::beans::PropertyChangeEvent& evt) throw (css::uno::RuntimeException, std::exception); + void SAL_CALL _propertyChange(const css::beans::PropertyChangeEvent& evt); // ContainerListener /// @throws css::uno::RuntimeException - void SAL_CALL _elementInserted( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException); + void SAL_CALL _elementInserted( const css::container::ContainerEvent& Event ); /// @throws css::uno::RuntimeException - void SAL_CALL _elementReplaced( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException); + void SAL_CALL _elementReplaced( const css::container::ContainerEvent& Event ); /// @throws css::uno::RuntimeException - void SAL_CALL _elementRemoved( const css::container::ContainerEvent& Event ) throw(css::uno::RuntimeException); + void SAL_CALL _elementRemoved( const css::container::ContainerEvent& Event ); virtual void SetLayer(SdrLayerID nLayer) override; void MakeDataAware( const css::uno::Reference< css::frame::XModel >& xModel ); diff --git a/basegfx/source/tools/unopolypolygon.cxx b/basegfx/source/tools/unopolypolygon.cxx index 12e00a784422..6d87f738448c 100644 --- a/basegfx/source/tools/unopolypolygon.cxx +++ b/basegfx/source/tools/unopolypolygon.cxx @@ -51,7 +51,7 @@ namespace unotools void SAL_CALL UnoPolyPolygon::addPolyPolygon( const geometry::RealPoint2D& position, - const uno::Reference< rendering::XPolyPolygon2D >& polyPolygon ) throw (lang::IllegalArgumentException,uno::RuntimeException, std::exception) + const uno::Reference< rendering::XPolyPolygon2D >& polyPolygon ) { osl::MutexGuard const guard( m_aMutex ); modifying(); @@ -129,14 +129,14 @@ namespace unotools maPolyPoly.append( aSrcPoly ); } - sal_Int32 SAL_CALL UnoPolyPolygon::getNumberOfPolygons() throw (uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL UnoPolyPolygon::getNumberOfPolygons() { osl::MutexGuard const guard( m_aMutex ); return maPolyPoly.count(); } sal_Int32 SAL_CALL UnoPolyPolygon::getNumberOfPolygonPoints( - sal_Int32 polygon ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException, std::exception) + sal_Int32 polygon ) { osl::MutexGuard const guard( m_aMutex ); checkIndex( polygon ); @@ -144,14 +144,14 @@ namespace unotools return maPolyPoly.getB2DPolygon(polygon).count(); } - rendering::FillRule SAL_CALL UnoPolyPolygon::getFillRule() throw (uno::RuntimeException, std::exception) + rendering::FillRule SAL_CALL UnoPolyPolygon::getFillRule() { osl::MutexGuard const guard( m_aMutex ); return meFillRule; } void SAL_CALL UnoPolyPolygon::setFillRule( - rendering::FillRule fillRule ) throw (uno::RuntimeException, std::exception) + rendering::FillRule fillRule ) { osl::MutexGuard const guard( m_aMutex ); modifying(); @@ -160,7 +160,7 @@ namespace unotools } sal_Bool SAL_CALL UnoPolyPolygon::isClosed( - sal_Int32 index ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException, std::exception) + sal_Int32 index ) { osl::MutexGuard const guard( m_aMutex ); checkIndex( index ); @@ -170,7 +170,7 @@ namespace unotools void SAL_CALL UnoPolyPolygon::setClosed( sal_Int32 index, - sal_Bool closedState ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException, std::exception) + sal_Bool closedState ) { osl::MutexGuard const guard( m_aMutex ); modifying(); @@ -197,7 +197,7 @@ namespace unotools sal_Int32 nPolygonIndex, sal_Int32 nNumberOfPolygons, sal_Int32 nPointIndex, - sal_Int32 nNumberOfPoints ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException, std::exception) + sal_Int32 nNumberOfPoints ) { osl::MutexGuard const guard( m_aMutex ); @@ -210,7 +210,7 @@ namespace unotools void SAL_CALL UnoPolyPolygon::setPoints( const uno::Sequence< uno::Sequence< geometry::RealPoint2D > >& points, - sal_Int32 nPolygonIndex ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException, std::exception) + sal_Int32 nPolygonIndex ) { osl::MutexGuard const guard( m_aMutex ); modifying(); @@ -232,7 +232,7 @@ namespace unotools geometry::RealPoint2D SAL_CALL UnoPolyPolygon::getPoint( sal_Int32 nPolygonIndex, - sal_Int32 nPointIndex ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException, std::exception) + sal_Int32 nPointIndex ) { osl::MutexGuard const guard( m_aMutex ); checkIndex( nPolygonIndex ); @@ -248,7 +248,7 @@ namespace unotools void SAL_CALL UnoPolyPolygon::setPoint( const geometry::RealPoint2D& point, sal_Int32 nPolygonIndex, - sal_Int32 nPointIndex ) throw (lang::IndexOutOfBoundsException,uno::RuntimeException, std::exception) + sal_Int32 nPointIndex ) { osl::MutexGuard const guard( m_aMutex ); checkIndex( nPolygonIndex ); @@ -268,7 +268,7 @@ namespace unotools sal_Int32 nPolygonIndex, sal_Int32 nNumberOfPolygons, sal_Int32 nPointIndex, - sal_Int32 nNumberOfPoints ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + sal_Int32 nNumberOfPoints ) { osl::MutexGuard const guard( m_aMutex ); return unotools::bezierSequenceSequenceFromB2DPolyPolygon( @@ -280,8 +280,7 @@ namespace unotools void SAL_CALL UnoPolyPolygon::setBezierSegments( const uno::Sequence< uno::Sequence< geometry::RealBezierSegment2D > >& points, - sal_Int32 nPolygonIndex ) throw (lang::IndexOutOfBoundsException, - uno::RuntimeException, std::exception) + sal_Int32 nPolygonIndex ) { osl::MutexGuard const guard( m_aMutex ); modifying(); @@ -301,8 +300,7 @@ namespace unotools } geometry::RealBezierSegment2D SAL_CALL UnoPolyPolygon::getBezierSegment( sal_Int32 nPolygonIndex, - sal_Int32 nPointIndex ) throw (lang::IndexOutOfBoundsException, - uno::RuntimeException, std::exception) + sal_Int32 nPointIndex ) { osl::MutexGuard const guard( m_aMutex ); checkIndex( nPolygonIndex ); @@ -327,8 +325,7 @@ namespace unotools void SAL_CALL UnoPolyPolygon::setBezierSegment( const geometry::RealBezierSegment2D& segment, sal_Int32 nPolygonIndex, - sal_Int32 nPointIndex ) throw (lang::IndexOutOfBoundsException, - uno::RuntimeException, std::exception) + sal_Int32 nPointIndex ) { osl::MutexGuard const guard( m_aMutex ); checkIndex( nPolygonIndex ); @@ -436,17 +433,17 @@ namespace unotools #define IMPLEMENTATION_NAME "gfx::internal::UnoPolyPolygon" #define SERVICE_NAME "com.sun.star.rendering.PolyPolygon2D" - OUString SAL_CALL UnoPolyPolygon::getImplementationName() throw( uno::RuntimeException, std::exception ) + OUString SAL_CALL UnoPolyPolygon::getImplementationName() { return OUString( IMPLEMENTATION_NAME ); } - sal_Bool SAL_CALL UnoPolyPolygon::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception ) + sal_Bool SAL_CALL UnoPolyPolygon::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } - uno::Sequence< OUString > SAL_CALL UnoPolyPolygon::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) + uno::Sequence< OUString > SAL_CALL UnoPolyPolygon::getSupportedServiceNames() { return { SERVICE_NAME }; } diff --git a/basegfx/source/tools/unotools.cxx b/basegfx/source/tools/unotools.cxx index b1666c3d149a..4e98741b9525 100644 --- a/basegfx/source/tools/unotools.cxx +++ b/basegfx/source/tools/unotools.cxx @@ -36,7 +36,6 @@ namespace unotools { B2DPolyPolygon polyPolygonBezierToB2DPolyPolygon(const drawing::PolyPolygonBezierCoords& rSourcePolyPolygon) - throw( lang::IllegalArgumentException ) { const sal_Int32 nOuterSequenceCount(rSourcePolyPolygon.Coordinates.getLength()); B2DPolyPolygon aNewPolyPolygon; diff --git a/basic/inc/sbobjmod.hxx b/basic/inc/sbobjmod.hxx index 1b63cc437d5d..a00c849bfee6 100644 --- a/basic/inc/sbobjmod.hxx +++ b/basic/inc/sbobjmod.hxx @@ -45,7 +45,7 @@ public: using SbxValue::GetObject; SbxVariable* GetObject(); /// @throws css::uno::RuntimeException - void SetUnoObject( const css::uno::Any& aObj )throw ( css::uno::RuntimeException, std::exception ) ; + void SetUnoObject( const css::uno::Any& aObj ) ; }; class FormObjEventListenerImpl; diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx index 21ffb5b90a2f..56cf96adebb6 100644 --- a/basic/source/basmgr/basmgr.cxx +++ b/basic/source/basmgr/basmgr.cxx @@ -135,16 +135,12 @@ public: // XEventListener - virtual void SAL_CALL disposing( const lang::EventObject& Source ) - throw(uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const lang::EventObject& Source ) override; // XContainerListener - virtual void SAL_CALL elementInserted( const container::ContainerEvent& Event ) - throw(uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementReplaced( const container::ContainerEvent& Event ) - throw(uno::RuntimeException, std::exception) override; - virtual void SAL_CALL elementRemoved( const container::ContainerEvent& Event ) - throw(uno::RuntimeException, std::exception) override; + virtual void SAL_CALL elementInserted( const container::ContainerEvent& Event ) override; + virtual void SAL_CALL elementReplaced( const container::ContainerEvent& Event ) override; + virtual void SAL_CALL elementRemoved( const container::ContainerEvent& Event ) override; }; @@ -216,7 +212,6 @@ void BasMgrContainerListenerImpl::addLibraryModulesImpl( BasicManager* pMgr, void SAL_CALL BasMgrContainerListenerImpl::disposing( const lang::EventObject& Source ) - throw( uno::RuntimeException, std::exception ) { (void)Source; } @@ -225,7 +220,6 @@ void SAL_CALL BasMgrContainerListenerImpl::disposing( const lang::EventObject& S void SAL_CALL BasMgrContainerListenerImpl::elementInserted( const container::ContainerEvent& Event ) - throw( uno::RuntimeException, std::exception ) { bool bLibContainer = maLibName.isEmpty(); OUString aName; @@ -272,7 +266,6 @@ void SAL_CALL BasMgrContainerListenerImpl::elementInserted( const container::Con void SAL_CALL BasMgrContainerListenerImpl::elementReplaced( const container::ContainerEvent& Event ) - throw( uno::RuntimeException, std::exception ) { OUString aName; Event.Accessor >>= aName; @@ -298,7 +291,6 @@ void SAL_CALL BasMgrContainerListenerImpl::elementReplaced( const container::Con void SAL_CALL BasMgrContainerListenerImpl::elementRemoved( const container::ContainerEvent& Event ) - throw( uno::RuntimeException, std::exception ) { OUString aName; Event.Accessor >>= aName; @@ -1629,11 +1621,11 @@ public: : maName( aName ), maLanguage( aLanguage), maSource( aSource ) {} // Methods XStarBasicModuleInfo - virtual OUString SAL_CALL getName() throw(uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getName() override { return maName; } - virtual OUString SAL_CALL getLanguage() throw(uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getLanguage() override { return maLanguage; } - virtual OUString SAL_CALL getSource() throw(uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getSource() override { return maSource; } }; @@ -1648,9 +1640,9 @@ public: : maName( aName ), mData( Data ) {} // Methods XStarBasicDialogInfo - virtual OUString SAL_CALL getName() throw(uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getName() override { return maName; } - virtual uno::Sequence< sal_Int8 > SAL_CALL getData() throw(uno::RuntimeException, std::exception) override + virtual uno::Sequence< sal_Int8 > SAL_CALL getData() override { return mData; } }; @@ -1683,17 +1675,17 @@ public: {} // Methods XStarBasicLibraryInfo - virtual OUString SAL_CALL getName() throw(uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getName() override { return maName; } - virtual uno::Reference< container::XNameContainer > SAL_CALL getModuleContainer() throw(uno::RuntimeException, std::exception) override + virtual uno::Reference< container::XNameContainer > SAL_CALL getModuleContainer() override { return mxModuleContainer; } - virtual uno::Reference< container::XNameContainer > SAL_CALL getDialogContainer() throw(uno::RuntimeException, std::exception) override + virtual uno::Reference< container::XNameContainer > SAL_CALL getDialogContainer() override { return mxDialogContainer; } - virtual OUString SAL_CALL getPassword() throw(uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getPassword() override { return maPassword; } - virtual OUString SAL_CALL getExternalSourceURL() throw(uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getExternalSourceURL() override { return maExternaleSourceURL; } - virtual OUString SAL_CALL getLinkTargetURL() throw(uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getLinkTargetURL() override { return maLinkTargetURL; } }; @@ -1707,49 +1699,36 @@ public: :mpLib( pLib ) {} // Methods 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; // Methods XNameAccess - virtual uno::Any SAL_CALL getByName( const OUString& aName ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; - virtual uno::Sequence< OUString > SAL_CALL getElementNames() - throw(uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) override; + virtual uno::Any SAL_CALL getByName( const OUString& aName ) override; + virtual uno::Sequence< OUString > SAL_CALL getElementNames() override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; // Methods XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::NoSuchElementException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) override; // Methods XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::ElementExistException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByName( const OUString& Name ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) override; + virtual void SAL_CALL removeByName( const OUString& Name ) override; }; // Methods XElementAccess uno::Type ModuleContainer_Impl::getElementType() - throw(uno::RuntimeException, std::exception) { uno::Type aModuleType = cppu::UnoType::get(); return aModuleType; } sal_Bool ModuleContainer_Impl::hasElements() - throw(uno::RuntimeException, std::exception) { return mpLib && !mpLib->GetModules().empty(); } // Methods XNameAccess uno::Any ModuleContainer_Impl::getByName( const OUString& aName ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SbModule* pMod = mpLib ? mpLib->FindModule( aName ) : nullptr; if( !pMod ) @@ -1761,7 +1740,6 @@ uno::Any ModuleContainer_Impl::getByName( const OUString& aName ) } uno::Sequence< OUString > ModuleContainer_Impl::getElementNames() - throw(uno::RuntimeException, std::exception) { sal_uInt16 nMods = mpLib ? mpLib->GetModules().size() : 0; uno::Sequence< OUString > aRetSeq( nMods ); @@ -1774,7 +1752,6 @@ uno::Sequence< OUString > ModuleContainer_Impl::getElementNames() } sal_Bool ModuleContainer_Impl::hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { SbModule* pMod = mpLib ? mpLib->FindModule( aName ) : nullptr; bool bRet = (pMod != nullptr); @@ -1784,7 +1761,6 @@ sal_Bool ModuleContainer_Impl::hasByName( const OUString& aName ) // Methods XNameReplace void ModuleContainer_Impl::replaceByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { removeByName( aName ); insertByName( aName, aElement ); @@ -1793,7 +1769,6 @@ void ModuleContainer_Impl::replaceByName( const OUString& aName, const uno::Any& // Methods XNameContainer void ModuleContainer_Impl::insertByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { uno::Type aModuleType = cppu::UnoType::get(); const uno::Type& aAnyType = aElement.getValueType(); @@ -1807,7 +1782,6 @@ void ModuleContainer_Impl::insertByName( const OUString& aName, const uno::Any& } void ModuleContainer_Impl::removeByName( const OUString& Name ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SbModule* pMod = mpLib ? mpLib->FindModule( Name ) : nullptr; if( !pMod ) @@ -1853,40 +1827,30 @@ public: :mpLib( pLib ) {} // Methods 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; // Methods XNameAccess - virtual uno::Any SAL_CALL getByName( const OUString& aName ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; - virtual uno::Sequence< OUString > SAL_CALL getElementNames() - throw(uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) override; + virtual uno::Any SAL_CALL getByName( const OUString& aName ) override; + virtual uno::Sequence< OUString > SAL_CALL getElementNames() override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; // Methods XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) override; // Methods XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByName( const OUString& Name ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) override; + virtual void SAL_CALL removeByName( const OUString& Name ) override; }; // Methods XElementAccess uno::Type DialogContainer_Impl::getElementType() - throw(uno::RuntimeException, std::exception) { uno::Type aModuleType = cppu::UnoType::get(); return aModuleType; } sal_Bool DialogContainer_Impl::hasElements() - throw(uno::RuntimeException, std::exception) { bool bRet = false; @@ -1906,7 +1870,6 @@ sal_Bool DialogContainer_Impl::hasElements() // Methods XNameAccess uno::Any DialogContainer_Impl::getByName( const OUString& aName ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SbxVariable* pVar = mpLib->GetObjects()->Find( aName, SbxClassType::DontCare ); SbxObject* pObj = dynamic_cast(pVar); @@ -1924,7 +1887,6 @@ uno::Any DialogContainer_Impl::getByName( const OUString& aName ) } uno::Sequence< OUString > DialogContainer_Impl::getElementNames() - throw(uno::RuntimeException, std::exception) { sal_Int16 nCount = mpLib->GetObjects()->Count(); uno::Sequence< OUString > aRetSeq( nCount ); @@ -1946,7 +1908,6 @@ uno::Sequence< OUString > DialogContainer_Impl::getElementNames() } sal_Bool DialogContainer_Impl::hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { bool bRet = false; SbxVariable* pVar = mpLib->GetObjects()->Find( aName, SbxClassType::DontCare ); @@ -1961,7 +1922,6 @@ sal_Bool DialogContainer_Impl::hasByName( const OUString& aName ) // Methods XNameReplace void DialogContainer_Impl::replaceByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { removeByName( aName ); insertByName( aName, aElement ); @@ -1970,7 +1930,6 @@ void DialogContainer_Impl::replaceByName( const OUString& aName, const uno::Any& // Methods XNameContainer void DialogContainer_Impl::insertByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { (void)aName; uno::Type aModuleType = cppu::UnoType::get(); @@ -1986,7 +1945,6 @@ void DialogContainer_Impl::insertByName( const OUString& aName, const uno::Any& } void DialogContainer_Impl::removeByName( const OUString& Name ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { (void)Name; SbxVariable* pVar = mpLib->GetObjects()->Find( Name, SbxClassType::DontCare ); @@ -2008,41 +1966,31 @@ public: :mpMgr( pMgr ) {} // Methods 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; // Methods XNameAccess - virtual uno::Any SAL_CALL getByName( const OUString& aName ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; - virtual uno::Sequence< OUString > SAL_CALL getElementNames() - throw(uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) override; + virtual uno::Any SAL_CALL getByName( const OUString& aName ) override; + virtual uno::Sequence< OUString > SAL_CALL getElementNames() override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; // Methods XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByName( const OUString& aName, const uno::Any& aElement ) override; // Methods XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByName( const OUString& Name ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByName( const OUString& aName, const uno::Any& aElement ) override; + virtual void SAL_CALL removeByName( const OUString& Name ) override; }; // Methods XElementAccess uno::Type LibraryContainer_Impl::getElementType() - throw(uno::RuntimeException, std::exception) { uno::Type aType = cppu::UnoType::get(); return aType; } sal_Bool LibraryContainer_Impl::hasElements() - throw(uno::RuntimeException, std::exception) { sal_Int32 nLibs = mpMgr->GetLibCount(); bool bRet = (nLibs > 0); @@ -2051,7 +1999,6 @@ sal_Bool LibraryContainer_Impl::hasElements() // Methods XNameAccess uno::Any LibraryContainer_Impl::getByName( const OUString& aName ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { uno::Any aRetAny; if( !mpMgr->HasLib( aName ) ) @@ -2094,7 +2041,6 @@ uno::Any LibraryContainer_Impl::getByName( const OUString& aName ) } uno::Sequence< OUString > LibraryContainer_Impl::getElementNames() - throw(uno::RuntimeException, std::exception) { sal_uInt16 nLibs = mpMgr->GetLibCount(); uno::Sequence< OUString > aRetSeq( nLibs ); @@ -2107,7 +2053,6 @@ uno::Sequence< OUString > LibraryContainer_Impl::getElementNames() } sal_Bool LibraryContainer_Impl::hasByName( const OUString& aName ) - throw(uno::RuntimeException, std::exception) { bool bRet = mpMgr->HasLib( aName ); return bRet; @@ -2115,7 +2060,6 @@ sal_Bool LibraryContainer_Impl::hasByName( const OUString& aName ) // Methods XNameReplace void LibraryContainer_Impl::replaceByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { removeByName( aName ); insertByName( aName, aElement ); @@ -2123,7 +2067,6 @@ void LibraryContainer_Impl::replaceByName( const OUString& aName, const uno::Any // Methods XNameContainer void LibraryContainer_Impl::insertByName( const OUString& aName, const uno::Any& aElement ) - throw(lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { (void)aName; (void)aElement; @@ -2131,7 +2074,6 @@ void LibraryContainer_Impl::insertByName( const OUString& aName, const uno::Any& } void LibraryContainer_Impl::removeByName( const OUString& Name ) - throw(container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { StarBASIC* pLib = mpMgr->GetLib( Name ); if( !pLib ) @@ -2157,21 +2099,16 @@ public: public: // Methods - virtual uno::Reference< container::XNameContainer > SAL_CALL getLibraryContainer() - throw(uno::RuntimeException, std::exception) override; + virtual uno::Reference< container::XNameContainer > SAL_CALL getLibraryContainer() override; virtual void SAL_CALL createLibrary( const OUString& LibName, const OUString& Password, - const OUString& ExternalSourceURL, const OUString& LinkTargetURL ) - throw(container::ElementExistException, uno::RuntimeException, std::exception) override; + const OUString& ExternalSourceURL, const OUString& LinkTargetURL ) override; virtual void SAL_CALL addModule( const OUString& LibraryName, const OUString& ModuleName, - const OUString& Language, const OUString& Source ) - throw(container::NoSuchElementException, uno::RuntimeException, std::exception) override; + const OUString& Language, const OUString& Source ) override; virtual void SAL_CALL addDialog( const OUString& LibraryName, const OUString& DialogName, - const uno::Sequence< sal_Int8 >& Data ) - throw(container::NoSuchElementException, uno::RuntimeException, std::exception) override; + const uno::Sequence< sal_Int8 >& Data ) override; }; uno::Reference< container::XNameContainer > SAL_CALL StarBasicAccess_Impl::getLibraryContainer() - throw(uno::RuntimeException, std::exception) { if( !mxLibContainer.is() ) mxLibContainer = new LibraryContainer_Impl( mpMgr ); @@ -2185,7 +2122,6 @@ void SAL_CALL StarBasicAccess_Impl::createLibrary const OUString& ExternalSourceURL, const OUString& LinkTargetURL ) - throw(container::ElementExistException, uno::RuntimeException, std::exception) { (void)ExternalSourceURL; StarBASIC* pLib = mpMgr->CreateLib( LibName, Password, LinkTargetURL ); @@ -2199,7 +2135,6 @@ void SAL_CALL StarBasicAccess_Impl::addModule const OUString& Language, const OUString& Source ) - throw(container::NoSuchElementException, uno::RuntimeException, std::exception) { (void)Language; StarBASIC* pLib = mpMgr->GetLib( LibraryName ); @@ -2216,7 +2151,6 @@ void SAL_CALL StarBasicAccess_Impl::addDialog const OUString& DialogName, const uno::Sequence< sal_Int8 >& Data ) - throw(container::NoSuchElementException, uno::RuntimeException, std::exception) { (void)LibraryName; (void)DialogName; diff --git a/basic/source/classes/errobject.cxx b/basic/source/classes/errobject.cxx index 1401dcd45242..7f90e16ce6b6 100644 --- a/basic/source/classes/errobject.cxx +++ b/basic/source/classes/errobject.cxx @@ -40,27 +40,27 @@ public: ErrObject(); // Attributes - virtual ::sal_Int32 SAL_CALL getNumber() throw (uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setNumber( ::sal_Int32 _number ) throw (uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getHelpContext() throw (uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHelpContext( ::sal_Int32 _helpcontext ) throw (uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getHelpFile() throw (uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setHelpFile( const OUString& _helpfile ) throw (uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDescription() throw (uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDescription( const OUString& _description ) throw (uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSource() throw (uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSource( const OUString& _source ) throw (uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getNumber() override; + virtual void SAL_CALL setNumber( ::sal_Int32 _number ) override; + virtual ::sal_Int32 SAL_CALL getHelpContext() override; + virtual void SAL_CALL setHelpContext( ::sal_Int32 _helpcontext ) override; + virtual OUString SAL_CALL getHelpFile() override; + virtual void SAL_CALL setHelpFile( const OUString& _helpfile ) override; + virtual OUString SAL_CALL getDescription() override; + virtual void SAL_CALL setDescription( const OUString& _description ) override; + virtual OUString SAL_CALL getSource() override; + virtual void SAL_CALL setSource( const OUString& _source ) override; // Methods - virtual void SAL_CALL Clear( ) throw (uno::RuntimeException, std::exception) override; - virtual void SAL_CALL Raise( const uno::Any& Number, const uno::Any& Source, const uno::Any& Description, const uno::Any& HelpFile, const uno::Any& HelpContext ) throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL Clear( ) override; + virtual void SAL_CALL Raise( const uno::Any& Number, const uno::Any& Source, const uno::Any& Description, const uno::Any& HelpFile, const uno::Any& HelpContext ) override; // XDefaultProperty - virtual OUString SAL_CALL getDefaultPropertyName( ) throw (uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getDefaultPropertyName( ) override; // Helper method /// @throws css::uno::RuntimeException void setData( const uno::Any& Number, const uno::Any& Source, const uno::Any& Description, - const uno::Any& HelpFile, const uno::Any& HelpContext ) throw (uno::RuntimeException); + const uno::Any& HelpFile, const uno::Any& HelpContext ); }; ErrObject::ErrObject() : m_nNumber(0), m_nHelpContext(0) @@ -68,13 +68,13 @@ ErrObject::ErrObject() : m_nNumber(0), m_nHelpContext(0) } sal_Int32 SAL_CALL -ErrObject::getNumber() throw (uno::RuntimeException, std::exception) +ErrObject::getNumber() { return m_nNumber; } void SAL_CALL -ErrObject::setNumber( ::sal_Int32 _number ) throw (uno::RuntimeException, std::exception) +ErrObject::setNumber( ::sal_Int32 _number ) { GetSbData()->pInst->setErrorVB( _number, OUString() ); OUString _description = GetSbData()->pInst->GetErrorMsg(); @@ -82,55 +82,55 @@ ErrObject::setNumber( ::sal_Int32 _number ) throw (uno::RuntimeException, std::e } ::sal_Int32 SAL_CALL -ErrObject::getHelpContext() throw (uno::RuntimeException, std::exception) +ErrObject::getHelpContext() { return m_nHelpContext; } void SAL_CALL -ErrObject::setHelpContext( ::sal_Int32 _helpcontext ) throw (uno::RuntimeException, std::exception) +ErrObject::setHelpContext( ::sal_Int32 _helpcontext ) { m_nHelpContext = _helpcontext; } OUString SAL_CALL -ErrObject::getHelpFile() throw (uno::RuntimeException, std::exception) +ErrObject::getHelpFile() { return m_sHelpFile; } void SAL_CALL -ErrObject::setHelpFile( const OUString& _helpfile ) throw (uno::RuntimeException, std::exception) +ErrObject::setHelpFile( const OUString& _helpfile ) { m_sHelpFile = _helpfile; } OUString SAL_CALL -ErrObject::getDescription() throw (uno::RuntimeException, std::exception) +ErrObject::getDescription() { return m_sDescription; } void SAL_CALL -ErrObject::setDescription( const OUString& _description ) throw (uno::RuntimeException, std::exception) +ErrObject::setDescription( const OUString& _description ) { m_sDescription = _description; } OUString SAL_CALL -ErrObject::getSource() throw (uno::RuntimeException, std::exception) +ErrObject::getSource() { return m_sSource; } void SAL_CALL -ErrObject::setSource( const OUString& _source ) throw (uno::RuntimeException, std::exception) +ErrObject::setSource( const OUString& _source ) { m_sSource = _source; } // Methods void SAL_CALL -ErrObject::Clear( ) throw (uno::RuntimeException, std::exception) +ErrObject::Clear( ) { m_sHelpFile.clear(); m_sSource = m_sHelpFile; @@ -140,7 +140,7 @@ ErrObject::Clear( ) throw (uno::RuntimeException, std::exception) } void SAL_CALL -ErrObject::Raise( const uno::Any& Number, const uno::Any& Source, const uno::Any& Description, const uno::Any& HelpFile, const uno::Any& HelpContext ) throw (uno::RuntimeException, std::exception) +ErrObject::Raise( const uno::Any& Number, const uno::Any& Source, const uno::Any& Description, const uno::Any& HelpFile, const uno::Any& HelpContext ) { setData( Number, Source, Description, HelpFile, HelpContext ); if ( m_nNumber ) @@ -149,13 +149,12 @@ ErrObject::Raise( const uno::Any& Number, const uno::Any& Source, const uno::Any // XDefaultProperty OUString SAL_CALL -ErrObject::getDefaultPropertyName( ) throw (uno::RuntimeException, std::exception) +ErrObject::getDefaultPropertyName( ) { return OUString( "Number" ); } void ErrObject::setData( const uno::Any& Number, const uno::Any& Source, const uno::Any& Description, const uno::Any& HelpFile, const uno::Any& HelpContext ) - throw (uno::RuntimeException) { if ( !Number.hasValue() ) throw uno::RuntimeException("Missing Required Parameter" ); @@ -198,7 +197,6 @@ SbxErrObject::getErrObject() } void SbxErrObject::setNumberAndDescription( ::sal_Int32 _number, const OUString& _description ) - throw (uno::RuntimeException) { if( m_pErrObject != nullptr ) { diff --git a/basic/source/classes/eventatt.cxx b/basic/source/classes/eventatt.cxx index e5c428e6493a..e900fa9bf527 100644 --- a/basic/source/classes/eventatt.cxx +++ b/basic/source/classes/eventatt.cxx @@ -148,18 +148,15 @@ public: : maBasicRef( pBasic ), m_xModel( xModel ) {} // Methods of XAllListener - virtual void SAL_CALL firing(const ScriptEvent& aScriptEvent) - throw( RuntimeException, std::exception ) override; - virtual Any SAL_CALL approveFiring(const ScriptEvent& aScriptEvent) - throw( InvocationTargetException, RuntimeException, std::exception ) override; + virtual void SAL_CALL firing(const ScriptEvent& aScriptEvent) override; + virtual Any SAL_CALL approveFiring(const ScriptEvent& aScriptEvent) override; // Methods of XEventListener - virtual void SAL_CALL disposing(const EventObject& Source) - throw( RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing(const EventObject& Source) override; }; // Methods XAllListener -void BasicScriptListener_Impl::firing( const ScriptEvent& aScriptEvent ) throw ( RuntimeException, std::exception ) +void BasicScriptListener_Impl::firing( const ScriptEvent& aScriptEvent ) { SolarMutexGuard g; @@ -167,7 +164,6 @@ void BasicScriptListener_Impl::firing( const ScriptEvent& aScriptEvent ) throw ( } Any BasicScriptListener_Impl::approveFiring( const ScriptEvent& aScriptEvent ) - throw ( InvocationTargetException, RuntimeException, std::exception ) { SolarMutexGuard g; @@ -177,7 +173,7 @@ Any BasicScriptListener_Impl::approveFiring( const ScriptEvent& aScriptEvent ) } // Methods XEventListener -void BasicScriptListener_Impl::disposing(const EventObject& ) throw ( RuntimeException, std::exception ) +void BasicScriptListener_Impl::disposing(const EventObject& ) { // TODO: ??? //SolarMutexGuard aGuard; diff --git a/basic/source/classes/propacc.cxx b/basic/source/classes/propacc.cxx index 143ec4d8940a..1dc958879ddf 100644 --- a/basic/source/classes/propacc.cxx +++ b/basic/source/classes/propacc.cxx @@ -57,7 +57,7 @@ SbPropertyValues::~SbPropertyValues() m_xInfo.clear(); } -Reference< XPropertySetInfo > SbPropertyValues::getPropertySetInfo() throw( RuntimeException, std::exception ) +Reference< XPropertySetInfo > SbPropertyValues::getPropertySetInfo() { // create on demand? if (!m_xInfo.is()) @@ -96,11 +96,6 @@ size_t SbPropertyValues::GetIndex_Impl( const OUString &rPropName ) const void SbPropertyValues::setPropertyValue( const OUString& aPropertyName, const Any& aValue) - throw (css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { size_t const nIndex = GetIndex_Impl( aPropertyName ); PropertyValue & rPropVal = m_aPropVals[nIndex]; @@ -110,9 +105,6 @@ void SbPropertyValues::setPropertyValue( Any SbPropertyValues::getPropertyValue( const OUString& aPropertyName) - throw(css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { size_t const nIndex = GetIndex_Impl( aPropertyName ); return m_aPropVals[nIndex].Value; @@ -122,7 +114,6 @@ Any SbPropertyValues::getPropertyValue( void SbPropertyValues::addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& ) - throw (std::exception) { (void)aPropertyName; } @@ -131,7 +122,6 @@ void SbPropertyValues::addPropertyChangeListener( void SbPropertyValues::removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& ) - throw (std::exception) { (void)aPropertyName; } @@ -140,7 +130,6 @@ void SbPropertyValues::removePropertyChangeListener( void SbPropertyValues::addVetoableChangeListener( const OUString& aPropertyName, const Reference< XVetoableChangeListener >& ) - throw(std::exception) { (void)aPropertyName; } @@ -149,24 +138,18 @@ void SbPropertyValues::addVetoableChangeListener( void SbPropertyValues::removeVetoableChangeListener( const OUString& aPropertyName, const Reference< XVetoableChangeListener >& ) - throw(std::exception) { (void)aPropertyName; } -Sequence< PropertyValue > SbPropertyValues::getPropertyValues() throw (css::uno::RuntimeException, std::exception) +Sequence< PropertyValue > SbPropertyValues::getPropertyValues() { return comphelper::containerToSequence(m_aPropVals); } void SbPropertyValues::setPropertyValues(const Sequence< PropertyValue >& rPropertyValues ) - throw (css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { if (!m_aPropVals.empty()) throw IllegalArgumentException(); diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx index e5875224388a..66c1a94e562b 100644 --- a/basic/source/classes/sb.cxx +++ b/basic/source/classes/sb.cxx @@ -82,9 +82,9 @@ public: mbDisposed = bDisposed; } - virtual void SAL_CALL queryClosing( const lang::EventObject& rSource, sal_Bool bGetsOwnership ) throw (util::CloseVetoException, uno::RuntimeException, std::exception) override; - virtual void SAL_CALL notifyClosing( const lang::EventObject& rSource ) throw (uno::RuntimeException, std::exception) override; - virtual void SAL_CALL disposing( const lang::EventObject& rSource ) throw (uno::RuntimeException, std::exception) override; + virtual void SAL_CALL queryClosing( const lang::EventObject& rSource, sal_Bool bGetsOwnership ) override; + virtual void SAL_CALL notifyClosing( const lang::EventObject& rSource ) override; + virtual void SAL_CALL disposing( const lang::EventObject& rSource ) override; private: StarBASIC& mrDocBasic; @@ -158,17 +158,17 @@ void DocBasicItem::stopListening() } } -void SAL_CALL DocBasicItem::queryClosing( const lang::EventObject& /*rSource*/, sal_Bool /*bGetsOwnership*/ ) throw (util::CloseVetoException, uno::RuntimeException, std::exception) +void SAL_CALL DocBasicItem::queryClosing( const lang::EventObject& /*rSource*/, sal_Bool /*bGetsOwnership*/ ) { } -void SAL_CALL DocBasicItem::notifyClosing( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL DocBasicItem::notifyClosing( const lang::EventObject& /*rEvent*/ ) { stopListening(); mbDocClosed = true; } -void SAL_CALL DocBasicItem::disposing( const lang::EventObject& /*rEvent*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL DocBasicItem::disposing( const lang::EventObject& /*rEvent*/ ) { stopListening(); } diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx index c1de49aa1dee..b85772631f74 100644 --- a/basic/source/classes/sbunoobj.cxx +++ b/basic/source/classes/sbunoobj.cxx @@ -3826,11 +3826,11 @@ public: explicit BasicAllListener_Impl( const OUString& aPrefixName ); // Methods of XAllListener - virtual void SAL_CALL firing(const AllEventObject& Event) throw ( RuntimeException, std::exception ) override; - virtual Any SAL_CALL approveFiring(const AllEventObject& Event) throw ( RuntimeException, std::exception ) override; + virtual void SAL_CALL firing(const AllEventObject& Event) override; + virtual Any SAL_CALL approveFiring(const AllEventObject& Event) override; // Methods of XEventListener - virtual void SAL_CALL disposing(const EventObject& Source) throw ( RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing(const EventObject& Source) override; }; @@ -3890,12 +3890,12 @@ void BasicAllListener_Impl::firing_impl( const AllEventObject& Event, Any* pRet // Methods of Listener -void BasicAllListener_Impl::firing( const AllEventObject& Event ) throw ( RuntimeException, std::exception ) +void BasicAllListener_Impl::firing( const AllEventObject& Event ) { firing_impl( Event, nullptr ); } -Any BasicAllListener_Impl::approveFiring( const AllEventObject& Event ) throw ( RuntimeException, std::exception ) +Any BasicAllListener_Impl::approveFiring( const AllEventObject& Event ) { Any aRetAny; firing_impl( Event, &aRetAny ); @@ -3904,7 +3904,7 @@ Any BasicAllListener_Impl::approveFiring( const AllEventObject& Event ) throw ( // Methods of XEventListener -void BasicAllListener_Impl ::disposing(const EventObject& ) throw ( RuntimeException, std::exception ) +void BasicAllListener_Impl ::disposing(const EventObject& ) { SolarMutexGuard guard; @@ -3922,14 +3922,12 @@ public: const Reference< XAllListener >& AllListener, const Any& Helper ); // XInvocation - virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection() throw( RuntimeException, std::exception ) override; - virtual Any SAL_CALL invoke(const OUString& FunctionName, const Sequence< Any >& Params, Sequence< sal_Int16 >& OutParamIndex, Sequence< Any >& OutParam) - throw( IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception ) override; - virtual void SAL_CALL setValue(const OUString& PropertyName, const Any& Value) - throw( UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception ) override; - virtual Any SAL_CALL getValue(const OUString& PropertyName) throw( UnknownPropertyException, RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL hasMethod(const OUString& Name) throw( RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL hasProperty(const OUString& Name) throw( RuntimeException, std::exception ) override; + virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection() override; + virtual Any SAL_CALL invoke(const OUString& FunctionName, const Sequence< Any >& Params, Sequence< sal_Int16 >& OutParamIndex, Sequence< Any >& OutParam) override; + virtual void SAL_CALL setValue(const OUString& PropertyName, const Any& Value) override; + virtual 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; private: Reference< XAllListener > m_xAllListener; @@ -3972,7 +3970,6 @@ InvocationToAllListenerMapper::InvocationToAllListenerMapper Reference< XIntrospectionAccess > SAL_CALL InvocationToAllListenerMapper::getIntrospection() - throw( RuntimeException, std::exception ) { return Reference< XIntrospectionAccess >(); } @@ -3980,8 +3977,6 @@ Reference< XIntrospectionAccess > SAL_CALL InvocationToAllListenerMapper::getInt Any SAL_CALL InvocationToAllListenerMapper::invoke(const OUString& FunctionName, const Sequence< Any >& Params, Sequence< sal_Int16 >& OutParamIndex, Sequence< Any >& OutParam) - throw( IllegalArgumentException, CannotConvertException, - InvocationTargetException, RuntimeException, std::exception ) { (void)OutParamIndex; (void)OutParam ; @@ -4033,8 +4028,6 @@ Any SAL_CALL InvocationToAllListenerMapper::invoke(const OUString& FunctionName, void SAL_CALL InvocationToAllListenerMapper::setValue(const OUString& PropertyName, const Any& Value) - throw( UnknownPropertyException, CannotConvertException, - InvocationTargetException, RuntimeException, std::exception ) { (void)PropertyName; (void)Value; @@ -4042,7 +4035,6 @@ void SAL_CALL InvocationToAllListenerMapper::setValue(const OUString& PropertyNa Any SAL_CALL InvocationToAllListenerMapper::getValue(const OUString& PropertyName) - throw( UnknownPropertyException, RuntimeException, std::exception ) { (void)PropertyName; @@ -4051,7 +4043,6 @@ Any SAL_CALL InvocationToAllListenerMapper::getValue(const OUString& PropertyNam sal_Bool SAL_CALL InvocationToAllListenerMapper::hasMethod(const OUString& Name) - throw( RuntimeException, std::exception ) { Reference< XIdlMethod > xMethod = m_xListenerType->getMethod( Name ); return xMethod.is(); @@ -4059,7 +4050,6 @@ sal_Bool SAL_CALL InvocationToAllListenerMapper::hasMethod(const OUString& Name) sal_Bool SAL_CALL InvocationToAllListenerMapper::hasProperty(const OUString& Name) - throw( RuntimeException, std::exception ) { Reference< XIdlField > xField = m_xListenerType->getField( Name ); return xField.is(); @@ -4242,25 +4232,21 @@ public: ModuleInvocationProxy( const OUString& aPrefix, SbxObjectRef xScopeObj ); // XInvocation - virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection() throw(std::exception) override; - virtual void SAL_CALL setValue( const OUString& rProperty, const Any& rValue ) - throw (UnknownPropertyException, RuntimeException, std::exception) override; - virtual Any SAL_CALL getValue( const OUString& rProperty ) - throw (UnknownPropertyException, RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasMethod( const OUString& rName ) throw(std::exception) override; - virtual sal_Bool SAL_CALL hasProperty( const OUString& rProp ) throw(std::exception) override; + virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection() override; + virtual void SAL_CALL setValue( const OUString& rProperty, const Any& rValue ) override; + virtual Any SAL_CALL getValue( const OUString& rProperty ) override; + virtual sal_Bool SAL_CALL hasMethod( const OUString& rName ) override; + virtual sal_Bool SAL_CALL hasProperty( const OUString& rProp ) override; virtual Any SAL_CALL invoke( const OUString& rFunction, const Sequence< Any >& rParams, Sequence< sal_Int16 >& rOutParamIndex, - Sequence< Any >& rOutParam ) - throw (CannotConvertException, InvocationTargetException, - RuntimeException, std::exception ) override; + Sequence< Any >& rOutParam ) override; // XComponent - virtual void SAL_CALL dispose() throw(RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const Reference< XEventListener >& xListener ) throw (RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& aListener ) throw (RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; + virtual void SAL_CALL addEventListener( const Reference< XEventListener >& xListener ) override; + virtual void SAL_CALL removeEventListener( const Reference< XEventListener >& aListener ) override; }; ModuleInvocationProxy::ModuleInvocationProxy( const OUString& aPrefix, SbxObjectRef xScopeObj ) @@ -4272,13 +4258,12 @@ ModuleInvocationProxy::ModuleInvocationProxy( const OUString& aPrefix, SbxObject m_bProxyIsClassModuleObject = xScopeObj.Is() && nullptr != dynamic_cast( xScopeObj.get() ); } -Reference< XIntrospectionAccess > SAL_CALL ModuleInvocationProxy::getIntrospection() throw(std::exception) +Reference< XIntrospectionAccess > SAL_CALL ModuleInvocationProxy::getIntrospection() { return Reference< XIntrospectionAccess >(); } void SAL_CALL ModuleInvocationProxy::setValue(const OUString& rProperty, const Any& rValue) - throw (UnknownPropertyException, RuntimeException, std::exception) { if( !m_bProxyIsClassModuleObject ) throw UnknownPropertyException(); @@ -4316,7 +4301,6 @@ void SAL_CALL ModuleInvocationProxy::setValue(const OUString& rProperty, const A } Any SAL_CALL ModuleInvocationProxy::getValue(const OUString& rProperty) - throw (UnknownPropertyException, RuntimeException, std::exception) { if( !m_bProxyIsClassModuleObject ) { @@ -4344,12 +4328,12 @@ Any SAL_CALL ModuleInvocationProxy::getValue(const OUString& rProperty) return aRet; } -sal_Bool SAL_CALL ModuleInvocationProxy::hasMethod( const OUString& ) throw(std::exception) +sal_Bool SAL_CALL ModuleInvocationProxy::hasMethod( const OUString& ) { return false; } -sal_Bool SAL_CALL ModuleInvocationProxy::hasProperty( const OUString& ) throw(std::exception) +sal_Bool SAL_CALL ModuleInvocationProxy::hasProperty( const OUString& ) { return false; } @@ -4358,8 +4342,6 @@ Any SAL_CALL ModuleInvocationProxy::invoke( const OUString& rFunction, const Sequence< Any >& rParams, Sequence< sal_Int16 >&, Sequence< Any >& ) - throw (CannotConvertException, InvocationTargetException, - RuntimeException, std::exception) { SolarMutexGuard guard; @@ -4426,7 +4408,6 @@ Any SAL_CALL ModuleInvocationProxy::invoke( const OUString& rFunction, } void SAL_CALL ModuleInvocationProxy::dispose() - throw(RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -4437,13 +4418,11 @@ void SAL_CALL ModuleInvocationProxy::dispose() } void SAL_CALL ModuleInvocationProxy::addEventListener( const Reference< XEventListener >& xListener ) - throw (RuntimeException, std::exception) { m_aListeners.addInterface( xListener ); } void SAL_CALL ModuleInvocationProxy::removeEventListener( const Reference< XEventListener >& xListener ) - throw (RuntimeException, std::exception) { m_aListeners.removeInterface( xListener ); } diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index 6f07eb3df5ca..dce7d98cdded 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -94,28 +94,28 @@ class DocObjectWrapper : public DocObjectWrapper_BASE Sequence< Type > m_Types; SbModule* m_pMod; /// @throws css::uno::RuntimeException - SbMethodRef getMethod( const OUString& aName ) throw (RuntimeException, std::exception); + SbMethodRef getMethod( const OUString& aName ); /// @throws css::uno::RuntimeException - SbPropertyRef getProperty( const OUString& aName ) throw (RuntimeException, std::exception); + SbPropertyRef getProperty( const OUString& aName ); public: explicit DocObjectWrapper( SbModule* pMod ); - virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() throw (RuntimeException, std::exception) override + virtual Sequence< sal_Int8 > SAL_CALL getImplementationId() override { return css::uno::Sequence(); } - virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection( ) throw (RuntimeException, std::exception) override; + virtual Reference< XIntrospectionAccess > SAL_CALL getIntrospection( ) override; - virtual Any SAL_CALL invoke( const OUString& aFunctionName, const Sequence< Any >& aParams, Sequence< ::sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam ) throw (IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception) override; - virtual void SAL_CALL setValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception) override; - virtual Any SAL_CALL getValue( const OUString& aPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasMethod( const OUString& aName ) throw (RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasProperty( const OUString& aName ) throw (RuntimeException, std::exception) override; - virtual Any SAL_CALL queryInterface( const Type& aType ) throw ( RuntimeException, std::exception ) override; + virtual Any SAL_CALL invoke( const OUString& aFunctionName, const Sequence< Any >& aParams, Sequence< ::sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam ) override; + virtual void SAL_CALL setValue( const OUString& aPropertyName, const Any& aValue ) override; + virtual 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; + virtual Any SAL_CALL queryInterface( const Type& aType ) override; - virtual Sequence< Type > SAL_CALL getTypes() throw ( RuntimeException, std::exception ) override; + virtual Sequence< Type > SAL_CALL getTypes() override; }; DocObjectWrapper::DocObjectWrapper( SbModule* pVar ) : m_pMod( pVar ) @@ -170,7 +170,6 @@ DocObjectWrapper::DocObjectWrapper( SbModule* pVar ) : m_pMod( pVar ) } Sequence< Type > SAL_CALL DocObjectWrapper::getTypes() - throw ( RuntimeException, std::exception ) { if ( m_Types.getLength() == 0 ) { @@ -197,13 +196,13 @@ Sequence< Type > SAL_CALL DocObjectWrapper::getTypes() } Reference< XIntrospectionAccess > SAL_CALL -DocObjectWrapper::getIntrospection( ) throw (RuntimeException, std::exception) +DocObjectWrapper::getIntrospection( ) { return nullptr; } Any SAL_CALL -DocObjectWrapper::invoke( const OUString& aFunctionName, const Sequence< Any >& aParams, Sequence< ::sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam ) throw (IllegalArgumentException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception) +DocObjectWrapper::invoke( const OUString& aFunctionName, const Sequence< Any >& aParams, Sequence< ::sal_Int16 >& aOutParamIndex, Sequence< Any >& aOutParam ) { if ( m_xAggInv.is() && m_xAggInv->hasMethod( aFunctionName ) ) return m_xAggInv->invoke( aFunctionName, aParams, aOutParamIndex, aOutParam ); @@ -297,7 +296,7 @@ DocObjectWrapper::invoke( const OUString& aFunctionName, const Sequence< Any >& } void SAL_CALL -DocObjectWrapper::setValue( const OUString& aPropertyName, const Any& aValue ) throw (UnknownPropertyException, CannotConvertException, InvocationTargetException, RuntimeException, std::exception) +DocObjectWrapper::setValue( const OUString& aPropertyName, const Any& aValue ) { if ( m_xAggInv.is() && m_xAggInv->hasProperty( aPropertyName ) ) return m_xAggInv->setValue( aPropertyName, aValue ); @@ -309,7 +308,7 @@ DocObjectWrapper::setValue( const OUString& aPropertyName, const Any& aValue ) t } Any SAL_CALL -DocObjectWrapper::getValue( const OUString& aPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception) +DocObjectWrapper::getValue( const OUString& aPropertyName ) { if ( m_xAggInv.is() && m_xAggInv->hasProperty( aPropertyName ) ) return m_xAggInv->getValue( aPropertyName ); @@ -327,7 +326,7 @@ DocObjectWrapper::getValue( const OUString& aPropertyName ) throw (UnknownProper } sal_Bool SAL_CALL -DocObjectWrapper::hasMethod( const OUString& aName ) throw (RuntimeException, std::exception) +DocObjectWrapper::hasMethod( const OUString& aName ) { if ( m_xAggInv.is() && m_xAggInv->hasMethod( aName ) ) return true; @@ -335,7 +334,7 @@ DocObjectWrapper::hasMethod( const OUString& aName ) throw (RuntimeException, st } sal_Bool SAL_CALL -DocObjectWrapper::hasProperty( const OUString& aName ) throw (RuntimeException, std::exception) +DocObjectWrapper::hasProperty( const OUString& aName ) { bool bRes = false; if ( m_xAggInv.is() && m_xAggInv->hasProperty( aName ) ) @@ -345,7 +344,6 @@ DocObjectWrapper::hasProperty( const OUString& aName ) throw (RuntimeException, } Any SAL_CALL DocObjectWrapper::queryInterface( const Type& aType ) - throw ( RuntimeException, std::exception ) { Any aRet = DocObjectWrapper_BASE::queryInterface( aType ); if ( aRet.hasValue() ) @@ -355,7 +353,7 @@ Any SAL_CALL DocObjectWrapper::queryInterface( const Type& aType ) return aRet; } -SbMethodRef DocObjectWrapper::getMethod( const OUString& aName ) throw (RuntimeException, std::exception) +SbMethodRef DocObjectWrapper::getMethod( const OUString& aName ) { SbMethodRef pMethod = nullptr; if ( m_pMod ) @@ -370,7 +368,7 @@ SbMethodRef DocObjectWrapper::getMethod( const OUString& aName ) throw (RuntimeE return pMethod; } -SbPropertyRef DocObjectWrapper::getProperty( const OUString& aName ) throw (RuntimeException, std::exception) +SbPropertyRef DocObjectWrapper::getProperty( const OUString& aName ) { SbPropertyRef pProperty = nullptr; if ( m_pMod ) @@ -2176,7 +2174,7 @@ SbObjModule::~SbObjModule() } void -SbObjModule::SetUnoObject( const uno::Any& aObj ) throw ( uno::RuntimeException, std::exception ) +SbObjModule::SetUnoObject( const uno::Any& aObj ) { SbUnoObject* pUnoObj = dynamic_cast( pDocObject.get() ); if ( pUnoObj && pUnoObj->getUnoAny() == aObj ) // object is equal, nothing to do @@ -2300,7 +2298,7 @@ public: mxModel.clear(); } - virtual void SAL_CALL windowOpened( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) override + virtual void SAL_CALL windowOpened( const lang::EventObject& /*e*/ ) override { if ( mpUserForm ) { @@ -2315,7 +2313,7 @@ public: } - virtual void SAL_CALL windowClosing( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) override + virtual void SAL_CALL windowClosing( const lang::EventObject& /*e*/ ) override { #ifdef IN_THE_FUTURE uno::Reference< awt::XDialog > xDialog( e.Source, uno::UNO_QUERY ); @@ -2347,21 +2345,21 @@ public: } - virtual void SAL_CALL windowClosed( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) override + virtual void SAL_CALL windowClosed( const lang::EventObject& /*e*/ ) override { mbOpened = false; mbShowing = false; } - virtual void SAL_CALL windowMinimized( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) override + virtual void SAL_CALL windowMinimized( const lang::EventObject& /*e*/ ) override { } - virtual void SAL_CALL windowNormalized( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) override + virtual void SAL_CALL windowNormalized( const lang::EventObject& /*e*/ ) override { } - virtual void SAL_CALL windowActivated( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) override + virtual void SAL_CALL windowActivated( const lang::EventObject& /*e*/ ) override { if ( mpUserForm ) { @@ -2374,13 +2372,13 @@ public: } } - virtual void SAL_CALL windowDeactivated( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) override + virtual void SAL_CALL windowDeactivated( const lang::EventObject& /*e*/ ) override { if ( mpUserForm ) mpUserForm->triggerDeactivateEvent(); } - virtual void SAL_CALL windowResized( const awt::WindowEvent& /*e*/ ) throw (uno::RuntimeException, std::exception) override + virtual void SAL_CALL windowResized( const awt::WindowEvent& /*e*/ ) override { if ( mpUserForm ) { @@ -2389,21 +2387,21 @@ public: } } - virtual void SAL_CALL windowMoved( const awt::WindowEvent& /*e*/ ) throw (uno::RuntimeException, std::exception) override + virtual void SAL_CALL windowMoved( const awt::WindowEvent& /*e*/ ) override { if ( mpUserForm ) mpUserForm->triggerLayoutEvent(); } - virtual void SAL_CALL windowShown( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) override + virtual void SAL_CALL windowShown( const lang::EventObject& /*e*/ ) override { } - virtual void SAL_CALL windowHidden( const lang::EventObject& /*e*/ ) throw (uno::RuntimeException, std::exception) override + virtual void SAL_CALL windowHidden( const lang::EventObject& /*e*/ ) override { } - virtual void SAL_CALL documentEventOccured( const document::DocumentEvent& rEvent ) throw (uno::RuntimeException, std::exception) override + virtual void SAL_CALL documentEventOccured( const document::DocumentEvent& rEvent ) override { // early disposing on document event "OnUnload", to be sure Basic still exists when calling VBA "UserForm_Terminate" if( rEvent.EventName == GlobalEventConfig::GetEventName( GlobalEventId::CLOSEDOC ) ) @@ -2415,7 +2413,7 @@ public: } } - virtual void SAL_CALL disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException, std::exception) override + virtual void SAL_CALL disposing( const lang::EventObject& /*Source*/ ) override { SAL_INFO("basic", "** Userform/Dialog disposing"); removeListener(); diff --git a/basic/source/inc/dlgcont.hxx b/basic/source/inc/dlgcont.hxx index 2955c5c2490c..2218b29d2665 100644 --- a/basic/source/inc/dlgcont.hxx +++ b/basic/source/inc/dlgcont.hxx @@ -46,8 +46,7 @@ class SfxDialogLibraryContainer : public SfxLibraryContainer const css::uno::Reference< css::container::XNameContainer>& xLibrary, const OUString& aElementName, const css::uno::Reference< css::io::XOutputStream >& xOutput - ) - throw(css::uno::Exception) override; + ) override; virtual css::uno::Any SAL_CALL importLibraryElement ( @@ -73,23 +72,17 @@ public: // Methods XStorageBasedLibraryContainer virtual void SAL_CALL storeLibrariesToStorage( - const css::uno::Reference< css::embed::XStorage >& RootStorage ) - throw (css::uno::RuntimeException, - css::lang::WrappedTargetException, - std::exception) override; + const css::uno::Reference< css::embed::XStorage >& RootStorage ) override; // Resource handling css::uno::Reference< css::resource::XStringResourcePersistence > implCreateStringResource( class SfxDialogLibrary* pDialog ); // Methods XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XLibraryQueryExecutable - virtual sal_Bool SAL_CALL HasExecutableCode(const OUString&) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL HasExecutableCode(const OUString&) override; }; @@ -135,7 +128,7 @@ public: // XStringResourceSupplier virtual css::uno::Reference< css::resource::XStringResourceResolver > - SAL_CALL getStringResource( ) throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getStringResource( ) override; const OUString& getName() { return m_aName; } diff --git a/basic/source/inc/errobject.hxx b/basic/source/inc/errobject.hxx index 07ac40f7e788..65c4722e3319 100644 --- a/basic/source/inc/errobject.hxx +++ b/basic/source/inc/errobject.hxx @@ -36,8 +36,7 @@ public: static css::uno::Reference< ooo::vba::XErrObject > const & getUnoErrObject(); /// @throws css::uno::RuntimeException - void setNumberAndDescription( ::sal_Int32 _number, const OUString& _description ) - throw (css::uno::RuntimeException); + void setNumberAndDescription( ::sal_Int32 _number, const OUString& _description ); }; #endif diff --git a/basic/source/inc/namecont.hxx b/basic/source/inc/namecont.hxx index 832061d69f03..cd785d0877c2 100644 --- a/basic/source/inc/namecont.hxx +++ b/basic/source/inc/namecont.hxx @@ -98,65 +98,36 @@ public: /// @throws css::container::ElementExistException /// @throws css::lang::WrappedTargetException /// @throws css::uno::RuntimeException - void insertCheck(const OUString& aName, const css::uno::Any& aElement) - throw (css::lang::IllegalArgumentException, - css::container::ElementExistException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception); + void insertCheck(const OUString& aName, const css::uno::Any& aElement); /// @throws css::lang::IllegalArgumentException /// @throws css::lang::WrappedTargetException /// @throws css::uno::RuntimeException - void insertNoCheck(const OUString& aName, const css::uno::Any& aElement) - throw (css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception); + void insertNoCheck(const OUString& aName, const css::uno::Any& aElement); // Methods XElementAccess - virtual css::uno::Type SAL_CALL getElementType( ) - throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; // Methods XNameAccess - virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) - throw(css::container::NoSuchElementException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) - throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; // Methods XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) - throw(css::lang::IllegalArgumentException, - css::container::NoSuchElementException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override; // Methods XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) - throw(css::lang::IllegalArgumentException, - css::container::ElementExistException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByName( const OUString& Name ) - throw(css::container::NoSuchElementException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) override; + virtual void SAL_CALL removeByName( const OUString& Name ) override; // Methods XContainer - virtual void SAL_CALL addContainerListener( const css::uno::Reference& xListener ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeContainerListener( const css::uno::Reference& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addContainerListener( const css::uno::Reference& xListener ) override; + virtual void SAL_CALL removeContainerListener( const css::uno::Reference& xListener ) override; // Methods XChangesNotifier - virtual void SAL_CALL addChangesListener( const css::uno::Reference& xListener ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeChangesListener( const css::uno::Reference& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addChangesListener( const css::uno::Reference& xListener ) override; + virtual void SAL_CALL removeChangesListener( const css::uno::Reference& xListener ) override; }; @@ -202,8 +173,7 @@ public: private: virtual bool implTypedNotify( const css::uno::Reference< css::script::vba::XVBAScriptListener >& rxListener, - const css::script::vba::VBAScriptEvent& rEvent ) - throw (css::uno::Exception) override; + const css::script::vba::VBAScriptEvent& rEvent ) override; }; @@ -300,8 +270,7 @@ protected: const css::uno::Reference< css::container::XNameContainer>& xLibrary, const OUString& aElementName, const css::uno::Reference< css::io::XOutputStream >& xOutput - ) - throw(css::uno::Exception) = 0; + ) = 0; virtual css::uno::Any SAL_CALL importLibraryElement ( @@ -324,9 +293,7 @@ protected: /// @throws css::lang::WrappedTargetException /// @throws css::uno::RuntimeException virtual bool implLoadPasswordLibrary( SfxLibrary* pLib, const OUString& Name, - bool bVerifyPasswordOnly=false ) - throw(css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception); + bool bVerifyPasswordOnly=false ); virtual void onNewRootStorage() = 0; @@ -357,8 +324,7 @@ protected: OUString& aUnexpandedStorageURL ); /// @throws css::uno::RuntimeException - OUString expand_url( const OUString& url ) - throw(css::uno::RuntimeException); + OUString expand_url( const OUString& url ); SfxLibrary* getImplLib( const OUString& rLibraryName ); @@ -394,146 +360,85 @@ public: static void leaveMethod(); // Methods XElementAccess - virtual css::uno::Type SAL_CALL getElementType() - throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() override; // Methods XNameAccess - virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) - throw(css::container::NoSuchElementException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() - throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames() override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; // Members XStorageBasedLibraryContainer - virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getRootStorage() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRootStorage( const css::uno::Reference< css::embed::XStorage >& _rootstorage ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL storeLibrariesToStorage( const css::uno::Reference< css::embed::XStorage >& RootStorage ) throw (css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getRootStorage() override; + virtual void SAL_CALL setRootStorage( const css::uno::Reference< css::embed::XStorage >& _rootstorage ) override; + virtual void SAL_CALL storeLibrariesToStorage( const css::uno::Reference< css::embed::XStorage >& RootStorage ) override; // Methods XModifiable (base of XPersistentLibraryContainer) - virtual sal_Bool SAL_CALL isModified( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setModified( sal_Bool bModified ) throw (css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isModified( ) override; + virtual void SAL_CALL setModified( sal_Bool bModified ) override; + virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override; + virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // Methods XPersistentLibraryContainer (base of XStorageBasedLibraryContainer) - virtual css::uno::Any SAL_CALL getRootLocation() throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getContainerLocationName() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL storeLibraries( ) throw (css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getRootLocation() override; + virtual OUString SAL_CALL getContainerLocationName() override; + virtual void SAL_CALL storeLibraries( ) override; //Methods XLibraryContainer3 - virtual OUString SAL_CALL getOriginalLibraryLinkURL( const OUString& Name ) - throw (css::lang::IllegalArgumentException, - css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getOriginalLibraryLinkURL( const OUString& Name ) override; // Methods XLibraryContainer2 (base of XPersistentLibraryContainer) - virtual sal_Bool SAL_CALL isLibraryLink( const OUString& Name ) - throw (css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getLibraryLinkURL( const OUString& Name ) - throw (css::lang::IllegalArgumentException, - css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isLibraryReadOnly( const OUString& Name ) - throw (css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLibraryReadOnly( const OUString& Name, sal_Bool bReadOnly ) - throw (css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL renameLibrary( const OUString& Name, const OUString& NewName ) - throw (css::container::NoSuchElementException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isLibraryLink( const OUString& Name ) override; + virtual OUString SAL_CALL getLibraryLinkURL( const OUString& Name ) override; + virtual sal_Bool SAL_CALL isLibraryReadOnly( const OUString& Name ) override; + virtual void SAL_CALL setLibraryReadOnly( const OUString& Name, sal_Bool bReadOnly ) override; + virtual void SAL_CALL renameLibrary( const OUString& Name, const OUString& NewName ) override; // Methods XLibraryContainer (base of XLibraryContainer2) virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL - createLibrary( const OUString& Name ) - throw(css::lang::IllegalArgumentException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) override; + createLibrary( const OUString& Name ) override; virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL createLibraryLink - ( const OUString& Name, const OUString& StorageURL, sal_Bool ReadOnly ) - throw(css::lang::IllegalArgumentException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeLibrary( const OUString& Name ) - throw(css::container::NoSuchElementException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isLibraryLoaded( const OUString& Name ) - throw(css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL loadLibrary( const OUString& Name ) - throw(css::container::NoSuchElementException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + ( const OUString& Name, const OUString& StorageURL, sal_Bool ReadOnly ) override; + virtual void SAL_CALL removeLibrary( const OUString& Name ) override; + virtual sal_Bool SAL_CALL isLibraryLoaded( const OUString& Name ) override; + virtual void SAL_CALL loadLibrary( const OUString& Name ) override; // Methods XInitialization virtual void SAL_CALL initialize( const css::uno::Sequence< - css::uno::Any >& aArguments ) - throw (css::uno::Exception, - css::uno::RuntimeException, std::exception) override; + css::uno::Any >& aArguments ) override; // Methods XLibraryContainerPassword - virtual sal_Bool SAL_CALL isLibraryPasswordProtected( const OUString& Name ) - throw (css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isLibraryPasswordVerified( const OUString& Name ) - throw (css::lang::IllegalArgumentException, - css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL verifyLibraryPassword( const OUString& Name, const OUString& Password ) - throw (css::lang::IllegalArgumentException, - css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isLibraryPasswordProtected( const OUString& Name ) override; + virtual sal_Bool SAL_CALL isLibraryPasswordVerified( const OUString& Name ) override; + virtual sal_Bool SAL_CALL verifyLibraryPassword( const OUString& Name, const OUString& Password ) override; virtual void SAL_CALL changeLibraryPassword( const OUString& Name, - const OUString& OldPassword, const OUString& NewPassword ) - throw (css::lang::IllegalArgumentException, - css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; + const OUString& OldPassword, const OUString& NewPassword ) override; // Methods XContainer virtual void SAL_CALL addContainerListener( const css::uno::Reference< - css::container::XContainerListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + css::container::XContainerListener >& xListener ) override; virtual void SAL_CALL removeContainerListener( const css::uno::Reference< - css::container::XContainerListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + css::container::XContainerListener >& xListener ) override; // Methods XLibraryContainerExport virtual void SAL_CALL exportLibrary( const OUString& Name, const OUString& URL, - const css::uno::Reference< css::task::XInteractionHandler >& Handler ) - throw (css::uno::Exception, - css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::task::XInteractionHandler >& Handler ) override; // Methods XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) - throw (css::uno::RuntimeException, std::exception) override = 0; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (css::uno::RuntimeException, std::exception) override = 0; + virtual OUString SAL_CALL getImplementationName( ) override = 0; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override = 0; // Methods XVBACompatibility - virtual sal_Bool SAL_CALL getVBACompatibilityMode() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setVBACompatibilityMode( sal_Bool _vbacompatmodeon ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getProjectName() throw (css::uno::RuntimeException, std::exception) override { return msProjectName; } - virtual void SAL_CALL setProjectName( const OUString& _projectname ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getRunningVBAScripts() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL getVBACompatibilityMode() override; + virtual void SAL_CALL setVBACompatibilityMode( sal_Bool _vbacompatmodeon ) override; + virtual OUString SAL_CALL getProjectName() override { return msProjectName; } + virtual void SAL_CALL setProjectName( const OUString& _projectname ) override; + virtual sal_Int32 SAL_CALL getRunningVBAScripts() override; virtual void SAL_CALL addVBAScriptListener( - const css::uno::Reference< css::script::vba::XVBAScriptListener >& Listener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::script::vba::XVBAScriptListener >& Listener ) override; virtual void SAL_CALL removeVBAScriptListener( - const css::uno::Reference< css::script::vba::XVBAScriptListener >& Listener ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL broadcastVBAScriptEvent( sal_Int32 nIdentifier, const OUString& rModuleName ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::script::vba::XVBAScriptListener >& Listener ) override; + virtual void SAL_CALL broadcastVBAScriptEvent( sal_Int32 nIdentifier, const OUString& rModuleName ) override; }; @@ -636,65 +541,41 @@ public: ); // Methods XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) throw( css::uno::RuntimeException, std::exception ) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& rType ) override; virtual void SAL_CALL acquire() throw() override { OComponentHelper::acquire(); } virtual void SAL_CALL release() throw() override { OComponentHelper::release(); } // Methods XElementAccess - virtual css::uno::Type SAL_CALL getElementType( ) - throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; // Methods XNameAccess - virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) - throw(css::container::NoSuchElementException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) - throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; // Methods XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) - throw(css::lang::IllegalArgumentException, - css::container::NoSuchElementException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override; // Methods XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) - throw(css::lang::IllegalArgumentException, - css::container::ElementExistException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByName( const OUString& Name ) - throw(css::container::NoSuchElementException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) override; + virtual void SAL_CALL removeByName( const OUString& Name ) override; // XTypeProvider - css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) - throw( css::uno::RuntimeException, std::exception ) override; - css::uno::Sequence SAL_CALL getImplementationId( ) - throw( css::uno::RuntimeException, std::exception ) override; + css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; + css::uno::Sequence SAL_CALL getImplementationId( ) override; // Methods XContainer virtual void SAL_CALL addContainerListener( const css::uno::Reference< - css::container::XContainerListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + css::container::XContainerListener >& xListener ) override; virtual void SAL_CALL removeContainerListener( const css::uno::Reference< - css::container::XContainerListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + css::container::XContainerListener >& xListener ) override; // Methods XChangesNotifier virtual void SAL_CALL addChangesListener( const css::uno::Reference< - css::util::XChangesListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + css::util::XChangesListener >& xListener ) override; virtual void SAL_CALL removeChangesListener( const css::uno::Reference< - css::util::XChangesListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + css::util::XChangesListener >& xListener ) override; public: struct LibraryContainerAccess { friend class SfxLibraryContainer; private: LibraryContainerAccess() { } }; diff --git a/basic/source/inc/propacc.hxx b/basic/source/inc/propacc.hxx index 1488625498bb..a3c79e6cdee8 100644 --- a/basic/source/inc/propacc.hxx +++ b/basic/source/inc/propacc.hxx @@ -48,39 +48,27 @@ public: // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() throw( css::uno::RuntimeException, std::exception ) override; + getPropertySetInfo() override; virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, - const css::uno::Any& aValue) - throw (css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Any& aValue) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& ) - throw (std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& ) override; virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, - const css::uno::Reference< css::beans::XPropertyChangeListener >& ) - throw (std::exception) override; + const css::uno::Reference< css::beans::XPropertyChangeListener >& ) override; virtual void SAL_CALL addVetoableChangeListener( const OUString& aPropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& ) - throw (std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& ) override; virtual void SAL_CALL removeVetoableChangeListener( const OUString& aPropertyName, - const css::uno::Reference< css::beans::XVetoableChangeListener >& ) - throw (std::exception) override; + const css::uno::Reference< css::beans::XVetoableChangeListener >& ) override; // XPropertyAccess - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValues(const css::uno::Sequence< css::beans::PropertyValue >& PropertyValues_) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues() override; + virtual void SAL_CALL setPropertyValues(const css::uno::Sequence< css::beans::PropertyValue >& PropertyValues_) override; }; class StarBASIC; diff --git a/basic/source/inc/scriptcont.hxx b/basic/source/inc/scriptcont.hxx index 341b4828d4c2..e727ecccd02a 100644 --- a/basic/source/inc/scriptcont.hxx +++ b/basic/source/inc/scriptcont.hxx @@ -46,8 +46,7 @@ class SfxScriptLibraryContainer : public SfxLibraryContainer, public OldBasicPas const css::uno::Reference< css::container::XNameContainer>& xLibrary, const OUString& aElementName, const css::uno::Reference< css::io::XOutputStream >& xOutput - ) - throw(css::uno::Exception) override; + ) override; virtual css::uno::Any SAL_CALL importLibraryElement ( @@ -72,9 +71,7 @@ class SfxScriptLibraryContainer : public SfxLibraryContainer, public OldBasicPas const css::uno::Reference< css::ucb::XSimpleFileAccess3 >& rToUseSFI, const css::uno::Reference< css::task::XInteractionHandler >& Handler ) override; virtual bool implLoadPasswordLibrary( SfxLibrary* pLib, const OUString& Name, - bool bVerifyPasswordOnly=false ) - throw(css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + bool bVerifyPasswordOnly=false ) override; virtual void onNewRootStorage() override; @@ -93,30 +90,16 @@ public: // Methods XLibraryContainerPassword - virtual sal_Bool SAL_CALL isLibraryPasswordProtected( const OUString& Name ) - throw (css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isLibraryPasswordVerified( const OUString& Name ) - throw (css::lang::IllegalArgumentException, - css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL verifyLibraryPassword( const OUString& Name, const OUString& Password ) - throw (css::lang::IllegalArgumentException, - css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isLibraryPasswordProtected( const OUString& Name ) override; + virtual sal_Bool SAL_CALL isLibraryPasswordVerified( const OUString& Name ) override; + virtual sal_Bool SAL_CALL verifyLibraryPassword( const OUString& Name, const OUString& Password ) override; virtual void SAL_CALL changeLibraryPassword( const OUString& Name, - const OUString& OldPassword, const OUString& NewPassword ) - throw (css::lang::IllegalArgumentException, - css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; + const OUString& OldPassword, const OUString& NewPassword ) override; // XLibraryQueryExecutable - virtual sal_Bool SAL_CALL HasExecutableCode(const OUString&) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL HasExecutableCode(const OUString&) override; // Methods XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; @@ -161,10 +144,10 @@ public: DECLARE_XTYPEPROVIDER() // XVBAModuleInfo - virtual css::script::ModuleInfo SAL_CALL getModuleInfo( const OUString& ModuleName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasModuleInfo( const OUString& ModuleName ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insertModuleInfo( const OUString& ModuleName, const css::script::ModuleInfo& ModuleInfo ) throw (css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeModuleInfo( const OUString& ModuleName ) throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::script::ModuleInfo SAL_CALL getModuleInfo( const OUString& ModuleName ) override; + virtual sal_Bool SAL_CALL hasModuleInfo( const OUString& ModuleName ) override; + virtual void SAL_CALL insertModuleInfo( const OUString& ModuleName, const css::script::ModuleInfo& ModuleInfo ) override; + virtual void SAL_CALL removeModuleInfo( const OUString& ModuleName ) override; static bool containsValidModule( const css::uno::Any& _rElement ); diff --git a/basic/source/runtime/comenumwrapper.cxx b/basic/source/runtime/comenumwrapper.cxx index eefff5d46645..7e2432e43b15 100644 --- a/basic/source/runtime/comenumwrapper.cxx +++ b/basic/source/runtime/comenumwrapper.cxx @@ -22,7 +22,6 @@ using namespace ::com::sun::star; sal_Bool SAL_CALL ComEnumerationWrapper::hasMoreElements() - throw ( uno::RuntimeException, std::exception ) { bool bResult = false; @@ -41,9 +40,6 @@ sal_Bool SAL_CALL ComEnumerationWrapper::hasMoreElements() } uno::Any SAL_CALL ComEnumerationWrapper::nextElement() - throw ( container::NoSuchElementException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception ) { try { diff --git a/basic/source/runtime/comenumwrapper.hxx b/basic/source/runtime/comenumwrapper.hxx index f1267ca9618f..8af4e164b06c 100644 --- a/basic/source/runtime/comenumwrapper.hxx +++ b/basic/source/runtime/comenumwrapper.hxx @@ -38,8 +38,8 @@ public: } // container::XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements() throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL nextElement() throw (css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasMoreElements() override; + virtual css::uno::Any SAL_CALL nextElement() override; }; #endif // INCLUDED_BASIC_SOURCE_RUNTIME_COMENUMWRAPPER_HXX diff --git a/basic/source/uno/dlgcont.cxx b/basic/source/uno/dlgcont.cxx index fb90243ebaa2..a1a1f05f57b4 100644 --- a/basic/source/uno/dlgcont.cxx +++ b/basic/source/uno/dlgcont.cxx @@ -152,7 +152,6 @@ void SAL_CALL SfxDialogLibraryContainer::writeLibraryElement const OUString& aElementName, const Reference< XOutputStream >& xOutput ) - throw(Exception) { Any aElement = xLib->getByName( aElementName ); Reference< XInputStreamProvider > xISP; @@ -185,7 +184,7 @@ void SAL_CALL SfxDialogLibraryContainer::writeLibraryElement xInput->closeInput(); } -void SfxDialogLibraryContainer::storeLibrariesToStorage( const uno::Reference< embed::XStorage >& xStorage ) throw ( RuntimeException, WrappedTargetException, std::exception ) +void SfxDialogLibraryContainer::storeLibrariesToStorage( const uno::Reference< embed::XStorage >& xStorage ) { LibraryContainerMethodGuard aGuard( *this ); mbOasis2OOoFormat = false; @@ -444,19 +443,19 @@ void SfxDialogLibraryContainer::onNewRootStorage() } sal_Bool SAL_CALL -SfxDialogLibraryContainer:: HasExecutableCode( const OUString& /*Library*/ ) throw (uno::RuntimeException, std::exception) +SfxDialogLibraryContainer:: HasExecutableCode( const OUString& /*Library*/ ) { return false; // dialog library has no executable code } // Service -OUString SAL_CALL SfxDialogLibraryContainer::getImplementationName( ) throw (RuntimeException, std::exception) +OUString SAL_CALL SfxDialogLibraryContainer::getImplementationName( ) { return OUString("com.sun.star.comp.sfx2.DialogLibraryContainer"); } -Sequence< OUString > SAL_CALL SfxDialogLibraryContainer::getSupportedServiceNames( ) throw (RuntimeException, std::exception) +Sequence< OUString > SAL_CALL SfxDialogLibraryContainer::getSupportedServiceNames( ) { return {"com.sun.star.script.DocumentDialogLibraryContainer", "com.sun.star.script.DialogLibraryContainer"}; // for compatibility @@ -554,7 +553,7 @@ void SfxDialogLibrary::storeResourcesToStorage( const css::uno::Reference< css:: // XStringResourceSupplier Reference< resource::XStringResourceResolver > - SAL_CALL SfxDialogLibrary::getStringResource( ) throw (RuntimeException, std::exception) + SAL_CALL SfxDialogLibrary::getStringResource( ) { if( !m_xStringResourcePersistence.is() ) m_xStringResourcePersistence = m_pParent->implCreateStringResource( this ); diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx index bc706067a172..ae579545f74b 100644 --- a/basic/source/uno/namecont.cxx +++ b/basic/source/uno/namecont.cxx @@ -99,13 +99,11 @@ static bool GbMigrationSuppressErrors = false; // Methods XElementAccess Type NameContainer::getElementType() - throw(RuntimeException, std::exception) { return mType; } sal_Bool NameContainer::hasElements() - throw(RuntimeException, std::exception) { bool bRet = (mnElementCount > 0); return bRet; @@ -113,7 +111,6 @@ sal_Bool NameContainer::hasElements() // Methods XNameAccess Any NameContainer::getByName( const OUString& aName ) - throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { NameContainerNameMap::iterator aIt = mHashMap.find( aName ); if( aIt == mHashMap.end() ) @@ -126,13 +123,11 @@ Any NameContainer::getByName( const OUString& aName ) } Sequence< OUString > NameContainer::getElementNames() - throw(RuntimeException, std::exception) { return comphelper::containerToSequence(mNames); } sal_Bool NameContainer::hasByName( const OUString& aName ) - throw(RuntimeException, std::exception) { NameContainerNameMap::iterator aIt = mHashMap.find( aName ); bool bRet = ( aIt != mHashMap.end() ); @@ -142,7 +137,6 @@ sal_Bool NameContainer::hasByName( const OUString& aName ) // Methods XNameReplace void NameContainer::replaceByName( const OUString& aName, const Any& aElement ) - throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { const Type& aAnyType = aElement.getValueType(); if( mType != aAnyType ) @@ -187,7 +181,6 @@ void NameContainer::replaceByName( const OUString& aName, const Any& aElement ) } void NameContainer::insertCheck(const OUString& aName, const Any& aElement) - throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) { NameContainerNameMap::iterator aIt = mHashMap.find(aName); if( aIt != mHashMap.end() ) @@ -198,7 +191,6 @@ void NameContainer::insertCheck(const OUString& aName, const Any& aElement) } void NameContainer::insertNoCheck(const OUString& aName, const Any& aElement) - throw(IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { const Type& aAnyType = aElement.getValueType(); if( mType != aAnyType ) @@ -240,13 +232,11 @@ void NameContainer::insertNoCheck(const OUString& aName, const Any& aElement) // Methods XNameContainer void NameContainer::insertByName( const OUString& aName, const Any& aElement ) - throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) { insertCheck(aName, aElement); } void NameContainer::removeByName( const OUString& aName ) - throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { NameContainerNameMap::iterator aIt = mHashMap.find( aName ); if( aIt == mHashMap.end() ) @@ -298,7 +288,6 @@ void NameContainer::removeByName( const OUString& aName ) // Methods XContainer void SAL_CALL NameContainer::addContainerListener( const Reference< XContainerListener >& xListener ) - throw (RuntimeException, std::exception) { if( !xListener.is() ) { @@ -309,7 +298,6 @@ void SAL_CALL NameContainer::addContainerListener( const Reference< XContainerLi } void SAL_CALL NameContainer::removeContainerListener( const Reference< XContainerListener >& xListener ) - throw (RuntimeException, std::exception) { if( !xListener.is() ) { @@ -321,7 +309,6 @@ void SAL_CALL NameContainer::removeContainerListener( const Reference< XContaine // Methods XChangesNotifier void SAL_CALL NameContainer::addChangesListener( const Reference< XChangesListener >& xListener ) - throw (RuntimeException, std::exception) { if( !xListener.is() ) { @@ -332,7 +319,6 @@ void SAL_CALL NameContainer::addChangesListener( const Reference< XChangesListen } void SAL_CALL NameContainer::removeChangesListener( const Reference< XChangesListener >& xListener ) - throw (RuntimeException, std::exception) { if( !xListener.is() ) { @@ -368,7 +354,6 @@ VBAScriptListenerContainer::VBAScriptListenerContainer( ::osl::Mutex& rMutex ) : } bool VBAScriptListenerContainer::implTypedNotify( const Reference< vba::XVBAScriptListener >& rxListener, const vba::VBAScriptEvent& rEvent ) - throw (Exception) { rxListener->notifyVBAScriptEvent( rEvent ); return true; // notify all other listeners too @@ -444,14 +429,13 @@ BasicManager* SfxLibraryContainer::getBasicManager() } // Methods XStorageBasedLibraryContainer -Reference< XStorage > SAL_CALL SfxLibraryContainer::getRootStorage() throw (RuntimeException, std::exception) +Reference< XStorage > SAL_CALL SfxLibraryContainer::getRootStorage() { LibraryContainerMethodGuard aGuard( *this ); return mxStorage; } void SAL_CALL SfxLibraryContainer::setRootStorage( const Reference< XStorage >& _rxRootStorage ) - throw (IllegalArgumentException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); if ( !_rxRootStorage.is() ) @@ -463,7 +447,6 @@ void SAL_CALL SfxLibraryContainer::setRootStorage( const Reference< XStorage >& } void SAL_CALL SfxLibraryContainer::storeLibrariesToStorage( const Reference< XStorage >& _rxRootStorage ) - throw (IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); if ( !_rxRootStorage.is() ) @@ -484,7 +467,6 @@ void SAL_CALL SfxLibraryContainer::storeLibrariesToStorage( const Reference< XSt // Methods XModifiable sal_Bool SfxLibraryContainer::isModified() - throw (RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); if ( maModifiable.isModified() ) @@ -527,41 +509,37 @@ sal_Bool SfxLibraryContainer::isModified() } void SAL_CALL SfxLibraryContainer::setModified( sal_Bool _bModified ) - throw (PropertyVetoException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); maModifiable.setModified( _bModified ); } void SAL_CALL SfxLibraryContainer::addModifyListener( const Reference< XModifyListener >& _rxListener ) - throw (RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); maModifiable.addModifyListener( _rxListener ); } void SAL_CALL SfxLibraryContainer::removeModifyListener( const Reference< XModifyListener >& _rxListener ) - throw (RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); maModifiable.removeModifyListener( _rxListener ); } // Methods XPersistentLibraryContainer -Any SAL_CALL SfxLibraryContainer::getRootLocation() throw (RuntimeException, std::exception) +Any SAL_CALL SfxLibraryContainer::getRootLocation() { LibraryContainerMethodGuard aGuard( *this ); return makeAny( getRootStorage() ); } -OUString SAL_CALL SfxLibraryContainer::getContainerLocationName() throw (RuntimeException, std::exception) +OUString SAL_CALL SfxLibraryContainer::getContainerLocationName() { LibraryContainerMethodGuard aGuard( *this ); return maLibrariesDir; } void SAL_CALL SfxLibraryContainer::storeLibraries( ) - throw (WrappedTargetException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); try @@ -1362,7 +1340,6 @@ bool SfxLibraryContainer::implLoadPasswordLibrary( SfxLibrary* /*pLib*/, const OUString& /*Name*/, bool /*bVerifyPasswordOnly*/ ) -throw(WrappedTargetException, RuntimeException, std::exception) { return true; } @@ -2180,14 +2157,12 @@ void SfxLibraryContainer::storeLibraries_Impl( const uno::Reference< embed::XSto // Methods XElementAccess Type SAL_CALL SfxLibraryContainer::getElementType() - throw(RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); return maNameContainer->getElementType(); } sal_Bool SfxLibraryContainer::hasElements() - throw(RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); bool bRet = maNameContainer->hasElements(); @@ -2196,7 +2171,6 @@ sal_Bool SfxLibraryContainer::hasElements() // Methods XNameAccess Any SfxLibraryContainer::getByName( const OUString& aName ) - throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); Any aRetAny = maNameContainer->getByName( aName ) ; @@ -2204,14 +2178,12 @@ Any SfxLibraryContainer::getByName( const OUString& aName ) } Sequence< OUString > SfxLibraryContainer::getElementNames() - throw(RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); return maNameContainer->getElementNames(); } sal_Bool SfxLibraryContainer::hasByName( const OUString& aName ) - throw(RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); return maNameContainer->hasByName( aName ) ; @@ -2219,7 +2191,6 @@ sal_Bool SfxLibraryContainer::hasByName( const OUString& aName ) // Methods XLibraryContainer Reference< XNameContainer > SAL_CALL SfxLibraryContainer::createLibrary( const OUString& Name ) - throw(IllegalArgumentException, ElementExistException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pNewLib = implCreateLibrary( Name ); @@ -2238,7 +2209,6 @@ Reference< XNameContainer > SAL_CALL SfxLibraryContainer::createLibrary( const O Reference< XNameAccess > SAL_CALL SfxLibraryContainer::createLibraryLink ( const OUString& Name, const OUString& StorageURL, sal_Bool ReadOnly ) - throw(IllegalArgumentException, ElementExistException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); // TODO: Check other reasons to force ReadOnly status @@ -2286,7 +2256,6 @@ Reference< XNameAccess > SAL_CALL SfxLibraryContainer::createLibraryLink } void SAL_CALL SfxLibraryContainer::removeLibrary( const OUString& Name ) - throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); // Get and hold library before removing @@ -2357,7 +2326,6 @@ void SAL_CALL SfxLibraryContainer::removeLibrary( const OUString& Name ) } sal_Bool SAL_CALL SfxLibraryContainer::isLibraryLoaded( const OUString& Name ) - throw(NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pImplLib = getImplLib( Name ); @@ -2367,7 +2335,6 @@ sal_Bool SAL_CALL SfxLibraryContainer::isLibraryLoaded( const OUString& Name ) void SAL_CALL SfxLibraryContainer::loadLibrary( const OUString& Name ) - throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); Any aLibAny = maNameContainer->getByName( Name ) ; @@ -2508,7 +2475,6 @@ void SAL_CALL SfxLibraryContainer::loadLibrary( const OUString& Name ) // Methods XLibraryContainer2 sal_Bool SAL_CALL SfxLibraryContainer::isLibraryLink( const OUString& Name ) - throw (NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pImplLib = getImplLib( Name ); @@ -2517,7 +2483,6 @@ sal_Bool SAL_CALL SfxLibraryContainer::isLibraryLink( const OUString& Name ) } OUString SAL_CALL SfxLibraryContainer::getLibraryLinkURL( const OUString& Name ) - throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pImplLib = getImplLib( Name ); @@ -2531,7 +2496,6 @@ OUString SAL_CALL SfxLibraryContainer::getLibraryLinkURL( const OUString& Name ) } sal_Bool SAL_CALL SfxLibraryContainer::isLibraryReadOnly( const OUString& Name ) - throw (NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pImplLib = getImplLib( Name ); @@ -2540,7 +2504,6 @@ sal_Bool SAL_CALL SfxLibraryContainer::isLibraryReadOnly( const OUString& Name ) } void SAL_CALL SfxLibraryContainer::setLibraryReadOnly( const OUString& Name, sal_Bool bReadOnly ) - throw (NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pImplLib = getImplLib( Name ); @@ -2564,7 +2527,6 @@ void SAL_CALL SfxLibraryContainer::setLibraryReadOnly( const OUString& Name, sal } void SAL_CALL SfxLibraryContainer::renameLibrary( const OUString& Name, const OUString& NewName ) - throw (NoSuchElementException, ElementExistException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); if( maNameContainer->hasByName( NewName ) ) @@ -2696,7 +2658,6 @@ void SAL_CALL SfxLibraryContainer::renameLibrary( const OUString& Name, const OU // Methods XInitialization void SAL_CALL SfxLibraryContainer::initialize( const Sequence< Any >& _rArguments ) - throw (Exception, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); sal_Int32 nArgCount = _rArguments.getLength(); @@ -2772,28 +2733,24 @@ void SAL_CALL SfxLibraryContainer::disposing() // Methods XLibraryContainerPassword sal_Bool SAL_CALL SfxLibraryContainer::isLibraryPasswordProtected( const OUString& ) - throw (NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); return false; } sal_Bool SAL_CALL SfxLibraryContainer::isLibraryPasswordVerified( const OUString& ) - throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); throw IllegalArgumentException(); } sal_Bool SAL_CALL SfxLibraryContainer::verifyLibraryPassword( const OUString&, const OUString& ) - throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); throw IllegalArgumentException(); } void SAL_CALL SfxLibraryContainer::changeLibraryPassword(const OUString&, const OUString&, const OUString& ) - throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); throw IllegalArgumentException(); @@ -2801,7 +2758,6 @@ void SAL_CALL SfxLibraryContainer::changeLibraryPassword(const OUString&, const // Methods XContainer void SAL_CALL SfxLibraryContainer::addContainerListener( const Reference< XContainerListener >& xListener ) - throw (RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); maNameContainer->setEventSource( static_cast< XInterface* >( static_cast(this) ) ); @@ -2809,7 +2765,6 @@ void SAL_CALL SfxLibraryContainer::addContainerListener( const Reference< XConta } void SAL_CALL SfxLibraryContainer::removeContainerListener( const Reference< XContainerListener >& xListener ) - throw (RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); maNameContainer->removeContainerListener( xListener ); @@ -2818,7 +2773,6 @@ void SAL_CALL SfxLibraryContainer::removeContainerListener( const Reference< XCo // Methods XLibraryContainerExport void SAL_CALL SfxLibraryContainer::exportLibrary( const OUString& Name, const OUString& URL, const Reference< XInteractionHandler >& Handler ) - throw ( uno::Exception, NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pImplLib = getImplLib( Name ); @@ -2854,7 +2808,6 @@ void SAL_CALL SfxLibraryContainer::exportLibrary( const OUString& Name, const OU } OUString SfxLibraryContainer::expand_url( const OUString& url ) - throw(css::uno::RuntimeException) { if (url.startsWithIgnoreAsciiCase( "vnd.sun.star.expand:" )) { @@ -2873,7 +2826,6 @@ OUString SfxLibraryContainer::expand_url( const OUString& url ) //XLibraryContainer3 OUString SAL_CALL SfxLibraryContainer::getOriginalLibraryLinkURL( const OUString& Name ) - throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pImplLib = getImplLib( Name ); @@ -2888,12 +2840,12 @@ OUString SAL_CALL SfxLibraryContainer::getOriginalLibraryLinkURL( const OUString // XVBACompatibility -sal_Bool SAL_CALL SfxLibraryContainer::getVBACompatibilityMode() throw (RuntimeException, std::exception) +sal_Bool SAL_CALL SfxLibraryContainer::getVBACompatibilityMode() { return mbVBACompat; } -void SAL_CALL SfxLibraryContainer::setVBACompatibilityMode( sal_Bool _vbacompatmodeon ) throw (RuntimeException, std::exception) +void SAL_CALL SfxLibraryContainer::setVBACompatibilityMode( sal_Bool _vbacompatmodeon ) { /* The member variable mbVBACompat must be set first, the following call to getBasicManager() may call getVBACompatibilityMode() which returns @@ -2930,7 +2882,7 @@ void SAL_CALL SfxLibraryContainer::setVBACompatibilityMode( sal_Bool _vbacompatm } } -void SAL_CALL SfxLibraryContainer::setProjectName( const OUString& _projectname ) throw (RuntimeException, std::exception) +void SAL_CALL SfxLibraryContainer::setProjectName( const OUString& _projectname ) { msProjectName = _projectname; BasicManager* pBasMgr = getBasicManager(); @@ -2944,23 +2896,23 @@ void SAL_CALL SfxLibraryContainer::setProjectName( const OUString& _projectname } } -sal_Int32 SAL_CALL SfxLibraryContainer::getRunningVBAScripts() throw (RuntimeException, std::exception) +sal_Int32 SAL_CALL SfxLibraryContainer::getRunningVBAScripts() { LibraryContainerMethodGuard aGuard( *this ); return mnRunningVBAScripts; } -void SAL_CALL SfxLibraryContainer::addVBAScriptListener( const Reference< vba::XVBAScriptListener >& rxListener ) throw (RuntimeException, std::exception) +void SAL_CALL SfxLibraryContainer::addVBAScriptListener( const Reference< vba::XVBAScriptListener >& rxListener ) { maVBAScriptListeners.addTypedListener( rxListener ); } -void SAL_CALL SfxLibraryContainer::removeVBAScriptListener( const Reference< vba::XVBAScriptListener >& rxListener ) throw (RuntimeException, std::exception) +void SAL_CALL SfxLibraryContainer::removeVBAScriptListener( const Reference< vba::XVBAScriptListener >& rxListener ) { maVBAScriptListeners.removeTypedListener( rxListener ); } -void SAL_CALL SfxLibraryContainer::broadcastVBAScriptEvent( sal_Int32 nIdentifier, const OUString& rModuleName ) throw (RuntimeException, std::exception) +void SAL_CALL SfxLibraryContainer::broadcastVBAScriptEvent( sal_Int32 nIdentifier, const OUString& rModuleName ) { // own lock for accessing the number of running scripts enterMethod(); @@ -2982,7 +2934,6 @@ void SAL_CALL SfxLibraryContainer::broadcastVBAScriptEvent( sal_Int32 nIdentifie // Methods XServiceInfo sal_Bool SAL_CALL SfxLibraryContainer::supportsService( const OUString& _rServiceName ) - throw (RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } @@ -3055,7 +3006,6 @@ void SfxLibrary::implSetModified( bool _bIsModified ) // Methods XInterface Any SAL_CALL SfxLibrary::queryInterface( const Type& rType ) - throw( RuntimeException, std::exception ) { Any aRet; @@ -3076,13 +3026,11 @@ Any SAL_CALL SfxLibrary::queryInterface( const Type& rType ) // Methods XElementAccess Type SfxLibrary::getElementType() - throw(RuntimeException, std::exception) { return maNameContainer->getElementType(); } sal_Bool SfxLibrary::hasElements() - throw(RuntimeException, std::exception) { bool bRet = maNameContainer->hasElements(); return bRet; @@ -3090,7 +3038,6 @@ sal_Bool SfxLibrary::hasElements() // Methods XNameAccess Any SfxLibrary::getByName( const OUString& aName ) - throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { impl_checkLoaded(); @@ -3099,13 +3046,11 @@ Any SfxLibrary::getByName( const OUString& aName ) } Sequence< OUString > SfxLibrary::getElementNames() - throw(RuntimeException, std::exception) { return maNameContainer->getElementNames(); } sal_Bool SfxLibrary::hasByName( const OUString& aName ) - throw(RuntimeException, std::exception) { bool bRet = maNameContainer->hasByName( aName ); return bRet; @@ -3140,7 +3085,6 @@ void SfxLibrary::impl_checkLoaded() // Methods XNameReplace void SfxLibrary::replaceByName( const OUString& aName, const Any& aElement ) - throw(IllegalArgumentException, NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { impl_checkReadOnly(); impl_checkLoaded(); @@ -3156,7 +3100,6 @@ void SfxLibrary::replaceByName( const OUString& aName, const Any& aElement ) // Methods XNameContainer void SfxLibrary::insertByName( const OUString& aName, const Any& aElement ) - throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) { impl_checkReadOnly(); impl_checkLoaded(); @@ -3199,7 +3142,6 @@ void SfxLibrary::impl_removeWithoutChecks( const OUString& _rElementName ) } void SfxLibrary::removeByName( const OUString& Name ) - throw(NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { impl_checkReadOnly(); impl_checkLoaded(); @@ -3208,7 +3150,6 @@ void SfxLibrary::removeByName( const OUString& Name ) // XTypeProvider Sequence< Type > SfxLibrary::getTypes() - throw( RuntimeException, std::exception ) { static OTypeCollection * s_pTypes_NameContainer = nullptr; if( !s_pTypes_NameContainer ) @@ -3229,35 +3170,30 @@ Sequence< Type > SfxLibrary::getTypes() Sequence< sal_Int8 > SfxLibrary::getImplementationId() - throw( RuntimeException, std::exception ) { return css::uno::Sequence(); } // Methods XContainer void SAL_CALL SfxLibrary::addContainerListener( const Reference< XContainerListener >& xListener ) - throw (RuntimeException, std::exception) { maNameContainer->setEventSource( static_cast< XInterface* >( static_cast(this) ) ); maNameContainer->addContainerListener( xListener ); } void SAL_CALL SfxLibrary::removeContainerListener( const Reference< XContainerListener >& xListener ) - throw (RuntimeException, std::exception) { maNameContainer->removeContainerListener( xListener ); } // Methods XChangesNotifier void SAL_CALL SfxLibrary::addChangesListener( const Reference< XChangesListener >& xListener ) - throw (RuntimeException, std::exception) { maNameContainer->setEventSource( static_cast< XInterface* >( static_cast(this) ) ); maNameContainer->addChangesListener( xListener ); } void SAL_CALL SfxLibrary::removeChangesListener( const Reference< XChangesListener >& xListener ) - throw (RuntimeException, std::exception) { maNameContainer->removeChangesListener( xListener ); } diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx index b50153e7eb2e..07f8935595e5 100644 --- a/basic/source/uno/scriptcont.cxx +++ b/basic/source/uno/scriptcont.cxx @@ -152,7 +152,6 @@ bool SAL_CALL SfxScriptLibraryContainer::isLibraryElementValid(const Any& rEleme void SAL_CALL SfxScriptLibraryContainer::writeLibraryElement( const Reference < XNameContainer >& xLib, const OUString& aElementName, const Reference< XOutputStream >& xOutput) - throw(Exception) { // Create sax writer Reference< XWriter > xWriter = xml::sax::Writer::create(mxContext); @@ -357,7 +356,6 @@ void SAL_CALL SfxScriptLibraryContainer::importFromOldStorage( const OUString& a // Methods XLibraryContainerPassword sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordProtected( const OUString& Name ) - throw (NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pImplLib = getImplLib( Name ); @@ -366,7 +364,6 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordProtected( const O } sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordVerified( const OUString& Name ) - throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pImplLib = getImplLib( Name ); @@ -380,7 +377,6 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer::isLibraryPasswordVerified( const OU sal_Bool SAL_CALL SfxScriptLibraryContainer::verifyLibraryPassword ( const OUString& Name, const OUString& Password ) - throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pImplLib = getImplLib( Name ); @@ -423,7 +419,6 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer::verifyLibraryPassword void SAL_CALL SfxScriptLibraryContainer::changeLibraryPassword( const OUString& Name, const OUString& OldPassword, const OUString& NewPassword ) - throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) { LibraryContainerMethodGuard aGuard( *this ); SfxLibrary* pImplLib = getImplLib( Name ); @@ -856,7 +851,6 @@ bool SfxScriptLibraryContainer::implStorePasswordLibrary( SfxLibrary* pLib, cons bool SfxScriptLibraryContainer::implLoadPasswordLibrary ( SfxLibrary* pLib, const OUString& Name, bool bVerifyPasswordOnly ) - throw(WrappedTargetException, RuntimeException, std::exception) { bool bRet = true; @@ -1150,7 +1144,6 @@ void SfxScriptLibraryContainer::onNewRootStorage() } sal_Bool SAL_CALL SfxScriptLibraryContainer:: HasExecutableCode( const OUString& Library ) - throw (uno::RuntimeException, std::exception) { BasicManager* pBasicMgr = getBasicManager(); OSL_ENSURE( pBasicMgr, "we need a basicmanager, really we do" ); @@ -1165,13 +1158,11 @@ sal_Bool SAL_CALL SfxScriptLibraryContainer:: HasExecutableCode( const OUString& // Service OUString SAL_CALL SfxScriptLibraryContainer::getImplementationName( ) - throw (RuntimeException, std::exception) { return OUString("com.sun.star.comp.sfx2.ScriptLibraryContainer" ); } Sequence< OUString > SAL_CALL SfxScriptLibraryContainer::getSupportedServiceNames( ) - throw (RuntimeException, std::exception) { return {"com.sun.star.script.DocumentScriptLibraryContainer", "com.sun.star.script.ScriptLibraryContainer"}; // for compatibility @@ -1254,7 +1245,6 @@ IMPLEMENT_FORWARD_XINTERFACE2( SfxScriptLibrary, SfxLibrary, SfxScriptLibrary_BA IMPLEMENT_FORWARD_XTYPEPROVIDER2( SfxScriptLibrary, SfxLibrary, SfxScriptLibrary_BASE ); script::ModuleInfo SAL_CALL SfxScriptLibrary::getModuleInfo( const OUString& ModuleName ) - throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { if ( !hasModuleInfo( ModuleName ) ) { @@ -1264,7 +1254,6 @@ script::ModuleInfo SAL_CALL SfxScriptLibrary::getModuleInfo( const OUString& Mod } sal_Bool SAL_CALL SfxScriptLibrary::hasModuleInfo( const OUString& ModuleName ) - throw (RuntimeException, std::exception) { bool bRes = false; ModuleInfoMap::iterator it = mModuleInfo.find( ModuleName ); @@ -1277,7 +1266,6 @@ sal_Bool SAL_CALL SfxScriptLibrary::hasModuleInfo( const OUString& ModuleName ) } void SAL_CALL SfxScriptLibrary::insertModuleInfo( const OUString& ModuleName, const script::ModuleInfo& ModuleInfo ) - throw (IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException, std::exception) { if ( hasModuleInfo( ModuleName ) ) { @@ -1287,7 +1275,6 @@ void SAL_CALL SfxScriptLibrary::insertModuleInfo( const OUString& ModuleName, co } void SAL_CALL SfxScriptLibrary::removeModuleInfo( const OUString& ModuleName ) - throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) { // #FIXME add NoSuchElementException to the spec if ( !hasModuleInfo( ModuleName ) ) diff --git a/binaryurp/source/bridge.cxx b/binaryurp/source/bridge.cxx index d47b83410708..a47fbaa9a3cb 100644 --- a/binaryurp/source/bridge.cxx +++ b/binaryurp/source/bridge.cxx @@ -848,7 +848,7 @@ Bridge::~Bridge() { } css::uno::Reference< css::uno::XInterface > Bridge::getInstance( - OUString const & sInstanceName) throw (css::uno::RuntimeException, std::exception) + OUString const & sInstanceName) { if (sInstanceName.isEmpty()) { throw css::uno::RuntimeException( @@ -885,18 +885,18 @@ css::uno::Reference< css::uno::XInterface > Bridge::getInstance( SAL_NO_ACQUIRE); } -OUString Bridge::getName() throw (css::uno::RuntimeException, std::exception) { +OUString Bridge::getName() { return name_; } -OUString Bridge::getDescription() throw (css::uno::RuntimeException, std::exception) { +OUString Bridge::getDescription() { OUStringBuffer b(name_); b.append(':'); b.append(connection_->getDescription()); return b.makeStringAndClear(); } -void Bridge::dispose() throw (css::uno::RuntimeException, std::exception) { +void Bridge::dispose() { // For terminate(true) not to deadlock, an external protocol must ensure // that dispose is not called from a thread pool worker thread (that dispose // is never called from the reader or writer thread is already ensured @@ -911,7 +911,6 @@ void Bridge::dispose() throw (css::uno::RuntimeException, std::exception) { void Bridge::addEventListener( css::uno::Reference< css::lang::XEventListener > const & xListener) - throw (css::uno::RuntimeException, std::exception) { assert(xListener.is()); { @@ -928,7 +927,6 @@ void Bridge::addEventListener( void Bridge::removeEventListener( css::uno::Reference< css::lang::XEventListener > const & aListener) - throw (css::uno::RuntimeException, std::exception) { osl::MutexGuard g(mutex_); Listeners::iterator i( diff --git a/binaryurp/source/bridge.hxx b/binaryurp/source/bridge.hxx index 517b69b81552..89bfac393a90 100644 --- a/binaryurp/source/bridge.hxx +++ b/binaryurp/source/bridge.hxx @@ -175,27 +175,21 @@ private: virtual ~Bridge() override; virtual com::sun::star::uno::Reference< com::sun::star::uno::XInterface > - SAL_CALL getInstance(OUString const & sInstanceName) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + SAL_CALL getInstance(OUString const & sInstanceName) override; - virtual OUString SAL_CALL getName() - throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; - virtual OUString SAL_CALL getDescription() - throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getDescription() override; - virtual void SAL_CALL dispose() - throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; virtual void SAL_CALL addEventListener( com::sun::star::uno::Reference< com::sun::star::lang::XEventListener > - const & xListener) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + const & xListener) override; virtual void SAL_CALL removeEventListener( com::sun::star::uno::Reference< com::sun::star::lang::XEventListener > - const & aListener) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + const & aListener) override; // Only called from reader_ thread: void sendCommitChangeRequest(); diff --git a/binaryurp/source/bridgefactory.cxx b/binaryurp/source/bridgefactory.cxx index 6e7e756e2a12..7f2f02a05d57 100644 --- a/binaryurp/source/bridgefactory.cxx +++ b/binaryurp/source/bridgefactory.cxx @@ -84,19 +84,16 @@ BridgeFactory::BridgeFactory(): BridgeFactory::~BridgeFactory() {} OUString BridgeFactory::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return static_getImplementationName(); } sal_Bool BridgeFactory::supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } css::uno::Sequence< OUString > BridgeFactory::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { return static_getSupportedServiceNames(); } @@ -106,9 +103,6 @@ css::uno::Reference< css::bridge::XBridge > BridgeFactory::createBridge( css::uno::Reference< css::connection::XConnection > const & aConnection, css::uno::Reference< css::bridge::XInstanceProvider > const & anInstanceProvider) - throw ( - css::bridge::BridgeExistsException, css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) { rtl::Reference< Bridge > b; { @@ -141,7 +135,7 @@ css::uno::Reference< css::bridge::XBridge > BridgeFactory::createBridge( } css::uno::Reference< css::bridge::XBridge > BridgeFactory::getBridge( - OUString const & sName) throw (css::uno::RuntimeException, std::exception) + OUString const & sName) { osl::MutexGuard g(m_aMutex); BridgeMap::iterator i(named_.find(sName)); @@ -150,7 +144,7 @@ css::uno::Reference< css::bridge::XBridge > BridgeFactory::getBridge( } css::uno::Sequence< css::uno::Reference< css::bridge::XBridge > > -BridgeFactory::getExistingBridges() throw (css::uno::RuntimeException, std::exception) { +BridgeFactory::getExistingBridges() { osl::MutexGuard g(m_aMutex); if (unnamed_.size() > SAL_MAX_INT32) { throw css::uno::RuntimeException( diff --git a/binaryurp/source/bridgefactory.hxx b/binaryurp/source/bridgefactory.hxx index 05e39b3dcfec..4d392c1e6a10 100644 --- a/binaryurp/source/bridgefactory.hxx +++ b/binaryurp/source/bridgefactory.hxx @@ -82,14 +82,12 @@ private: virtual ~BridgeFactory() override; - virtual OUString SAL_CALL getImplementationName() - throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override; virtual com::sun::star::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (com::sun::star::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; virtual com::sun::star::uno::Reference< com::sun::star::bridge::XBridge > SAL_CALL createBridge( @@ -98,21 +96,16 @@ private: com::sun::star::connection::XConnection > const & aConnection, com::sun::star::uno::Reference< com::sun::star::bridge::XInstanceProvider > const & - anInstanceProvider) - throw ( - com::sun::star::bridge::BridgeExistsException, - com::sun::star::lang::IllegalArgumentException, - com::sun::star::uno::RuntimeException, std::exception) override; + anInstanceProvider) override; virtual com::sun::star::uno::Reference< com::sun::star::bridge::XBridge > SAL_CALL getBridge( - OUString const & sName) - throw (com::sun::star::uno::RuntimeException, std::exception) override; + OUString const & sName) override; virtual com::sun::star::uno::Sequence< com::sun::star::uno::Reference< com::sun::star::bridge::XBridge > > - SAL_CALL getExistingBridges() throw (com::sun::star::uno::RuntimeException, std::exception) override; + SAL_CALL getExistingBridges() override; void SAL_CALL disposing() override; diff --git a/canvas/source/cairo/cairo_canvas.cxx b/canvas/source/cairo/cairo_canvas.cxx index d56256d2f6cd..b3f403927f69 100644 --- a/canvas/source/cairo/cairo_canvas.cxx +++ b/canvas/source/cairo/cairo_canvas.cxx @@ -121,7 +121,7 @@ namespace cairocanvas CanvasBaseT::disposeThis(); } - OUString SAL_CALL Canvas::getServiceName( ) throw (uno::RuntimeException, std::exception) + OUString SAL_CALL Canvas::getServiceName( ) { return OUString( CANVAS_SERVICE_NAME ); } diff --git a/canvas/source/cairo/cairo_canvas.hxx b/canvas/source/cairo/cairo_canvas.hxx index 588b13e2d4cc..4f32368dcd79 100644 --- a/canvas/source/cairo/cairo_canvas.hxx +++ b/canvas/source/cairo/cairo_canvas.hxx @@ -124,7 +124,7 @@ namespace cairocanvas DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( Canvas, GraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase ) // XServiceName - virtual OUString SAL_CALL getServiceName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName( ) override; // RepaintTarget virtual bool repaint( const ::cairo::SurfaceSharedPtr& pSurface, diff --git a/canvas/source/cairo/cairo_canvasbitmap.cxx b/canvas/source/cairo/cairo_canvasbitmap.cxx index 09e1d210a9e7..88cef30db4c8 100644 --- a/canvas/source/cairo/cairo_canvasbitmap.cxx +++ b/canvas/source/cairo/cairo_canvasbitmap.cxx @@ -104,7 +104,7 @@ namespace cairocanvas return maCanvasHelper.repaint( pSurface, viewState, renderState ); } - uno::Any SAL_CALL CanvasBitmap::getFastPropertyValue( sal_Int32 nHandle ) throw (uno::RuntimeException, std::exception) + uno::Any SAL_CALL CanvasBitmap::getFastPropertyValue( sal_Int32 nHandle ) { uno::Any aRV( sal_Int32(0) ); // 0 ... get BitmapEx @@ -208,17 +208,17 @@ namespace cairocanvas return aRV; } - OUString SAL_CALL CanvasBitmap::getImplementationName( ) throw (uno::RuntimeException, std::exception) + OUString SAL_CALL CanvasBitmap::getImplementationName( ) { return OUString( "CairoCanvas.CanvasBitmap" ); } - sal_Bool SAL_CALL CanvasBitmap::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException, std::exception) + sal_Bool SAL_CALL CanvasBitmap::supportsService( const OUString& ServiceName ) { return cppu::supportsService( this, ServiceName ); } - uno::Sequence< OUString > SAL_CALL CanvasBitmap::getSupportedServiceNames( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< OUString > SAL_CALL CanvasBitmap::getSupportedServiceNames( ) { return { "com.sun.star.rendering.CanvasBitmap" }; } diff --git a/canvas/source/cairo/cairo_canvasbitmap.hxx b/canvas/source/cairo/cairo_canvasbitmap.hxx index d7954183e75d..8b583340d3cc 100644 --- a/canvas/source/cairo/cairo_canvasbitmap.hxx +++ b/canvas/source/cairo/cairo_canvasbitmap.hxx @@ -87,9 +87,9 @@ namespace cairocanvas DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasBitmap, CanvasBitmapBase_Base, ::cppu::WeakComponentImplHelperBase ) // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // SurfaceProvider virtual ::cairo::SurfaceSharedPtr getSurface() override; @@ -113,8 +113,8 @@ namespace cairocanvas // 1st a bool value: true - free the pixmap after used by XFreePixmap, false do nothing, the pixmap is used internally in the canvas // 2nd the pixmap handle // 3rd the pixmap depth - virtual css::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFastPropertyValue(sal_Int32, const css::uno::Any&) throw (css::uno::RuntimeException, std::exception) override {} + virtual css::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) override; + virtual void SAL_CALL setFastPropertyValue(sal_Int32, const css::uno::Any&) override {} private: SurfaceProviderRef mpSurfaceProvider; diff --git a/canvas/source/cairo/cairo_canvascustomsprite.cxx b/canvas/source/cairo/cairo_canvascustomsprite.cxx index 107b0fe393c5..eeb0b2abc755 100644 --- a/canvas/source/cairo/cairo_canvascustomsprite.cxx +++ b/canvas/source/cairo/cairo_canvascustomsprite.cxx @@ -132,17 +132,17 @@ namespace cairocanvas return mpSpriteCanvas->getOutputDevice(); } - OUString SAL_CALL CanvasCustomSprite::getImplementationName() throw( uno::RuntimeException, std::exception ) + OUString SAL_CALL CanvasCustomSprite::getImplementationName() { return OUString( "CairoCanvas.CanvasCustomSprite" ); } - sal_Bool SAL_CALL CanvasCustomSprite::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception ) + sal_Bool SAL_CALL CanvasCustomSprite::supportsService( const OUString& ServiceName ) { return cppu::supportsService( this, ServiceName ); } - uno::Sequence< OUString > SAL_CALL CanvasCustomSprite::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) + uno::Sequence< OUString > SAL_CALL CanvasCustomSprite::getSupportedServiceNames() { return { "com.sun.star.rendering.CanvasCustomSprite" }; } diff --git a/canvas/source/cairo/cairo_canvascustomsprite.hxx b/canvas/source/cairo/cairo_canvascustomsprite.hxx index 6ce6102fbbc3..95f5bf91ef0c 100644 --- a/canvas/source/cairo/cairo_canvascustomsprite.hxx +++ b/canvas/source/cairo/cairo_canvascustomsprite.hxx @@ -113,9 +113,9 @@ namespace cairocanvas DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasCustomSprite, CanvasCustomSpriteBase_Base, ::cppu::WeakComponentImplHelperBase ) // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // Sprite virtual void redraw( const ::cairo::CairoSharedPtr& pCairo, diff --git a/canvas/source/cairo/cairo_canvasfont.cxx b/canvas/source/cairo/cairo_canvasfont.cxx index 3206e2c31a3c..cbb9ff8f0d58 100644 --- a/canvas/source/cairo/cairo_canvasfont.cxx +++ b/canvas/source/cairo/cairo_canvasfont.cxx @@ -92,7 +92,7 @@ namespace cairocanvas mpRefDevice.clear(); } - uno::Reference< rendering::XTextLayout > SAL_CALL CanvasFont::createTextLayout( const rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) throw (uno::RuntimeException, std::exception) + uno::Reference< rendering::XTextLayout > SAL_CALL CanvasFont::createTextLayout( const rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) { SolarMutexGuard aGuard; @@ -106,42 +106,42 @@ namespace cairocanvas mpRefDevice ); } - rendering::FontRequest SAL_CALL CanvasFont::getFontRequest( ) throw (uno::RuntimeException, std::exception) + rendering::FontRequest SAL_CALL CanvasFont::getFontRequest( ) { SolarMutexGuard aGuard; return maFontRequest; } - rendering::FontMetrics SAL_CALL CanvasFont::getFontMetrics( ) throw (uno::RuntimeException, std::exception) + rendering::FontMetrics SAL_CALL CanvasFont::getFontMetrics( ) { // TODO(F1) return rendering::FontMetrics(); } - uno::Sequence< double > SAL_CALL CanvasFont::getAvailableSizes( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< double > SAL_CALL CanvasFont::getAvailableSizes( ) { // TODO(F1) return uno::Sequence< double >(); } - uno::Sequence< beans::PropertyValue > SAL_CALL CanvasFont::getExtraFontProperties( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< beans::PropertyValue > SAL_CALL CanvasFont::getExtraFontProperties( ) { // TODO(F1) return uno::Sequence< beans::PropertyValue >(); } - OUString SAL_CALL CanvasFont::getImplementationName() throw( uno::RuntimeException, std::exception ) + OUString SAL_CALL CanvasFont::getImplementationName() { return OUString( "CairoCanvas::CanvasFont" ); } - sal_Bool SAL_CALL CanvasFont::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception ) + sal_Bool SAL_CALL CanvasFont::supportsService( const OUString& ServiceName ) { return cppu::supportsService( this, ServiceName ); } - uno::Sequence< OUString > SAL_CALL CanvasFont::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) + uno::Sequence< OUString > SAL_CALL CanvasFont::getSupportedServiceNames() { return { "com.sun.star.rendering.CanvasFont" }; } diff --git a/canvas/source/cairo/cairo_canvasfont.hxx b/canvas/source/cairo/cairo_canvasfont.hxx index 1fdeba085f6d..2bcb97eb2f8b 100644 --- a/canvas/source/cairo/cairo_canvasfont.hxx +++ b/canvas/source/cairo/cairo_canvasfont.hxx @@ -61,16 +61,16 @@ namespace cairocanvas virtual void SAL_CALL disposing() override; // XCanvasFont - virtual css::uno::Reference< css::rendering::XTextLayout > SAL_CALL createTextLayout( const css::rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::rendering::FontRequest SAL_CALL getFontRequest( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::rendering::FontMetrics SAL_CALL getFontMetrics( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< double > SAL_CALL getAvailableSizes( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getExtraFontProperties( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::rendering::XTextLayout > SAL_CALL createTextLayout( const css::rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) override; + virtual css::rendering::FontRequest SAL_CALL getFontRequest( ) override; + virtual css::rendering::FontMetrics SAL_CALL getFontMetrics( ) override; + virtual css::uno::Sequence< double > SAL_CALL getAvailableSizes( ) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getExtraFontProperties( ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; vcl::Font getVCLFont() const; diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx index b2f673bab8c5..e75300ad1621 100644 --- a/canvas/source/cairo/cairo_canvashelper.cxx +++ b/canvas/source/cairo/cairo_canvashelper.cxx @@ -1602,25 +1602,24 @@ namespace cairocanvas uno::Sequence< sal_Int8 > maComponentTags; uno::Sequence< sal_Int32 > maBitCounts; - virtual ::sal_Int8 SAL_CALL getType( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int8 SAL_CALL getType( ) override { return rendering::ColorSpaceType::RGB; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags( ) override { return maComponentTags; } - virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) override { return rendering::RenderingIntent::PERCEPTUAL; } - virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties( ) override { return uno::Sequence< beans::PropertyValue >(); } virtual uno::Sequence< double > SAL_CALL convertColorSpace( const uno::Sequence< double >& deviceColor, - const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) override + const uno::Reference< rendering::XColorSpace >& targetColorSpace ) override { // TODO(P3): if we know anything about target // colorspace, this can be greatly sped up @@ -1628,7 +1627,7 @@ namespace cairocanvas convertToARGB(deviceColor)); return targetColorSpace->convertFromARGB(aIntermediate); } - virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) override { const double* pIn( deviceColor.getConstArray() ); const std::size_t nLen( deviceColor.getLength() ); @@ -1649,7 +1648,7 @@ namespace cairocanvas } return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) override { const double* pIn( deviceColor.getConstArray() ); const std::size_t nLen( deviceColor.getLength() ); @@ -1670,7 +1669,7 @@ namespace cairocanvas } return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) override { const double* pIn( deviceColor.getConstArray() ); const std::size_t nLen( deviceColor.getLength() ); @@ -1687,7 +1686,7 @@ namespace cairocanvas } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) override { const rendering::RGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); @@ -1704,7 +1703,7 @@ namespace cairocanvas } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); @@ -1721,7 +1720,7 @@ namespace cairocanvas } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); @@ -1740,21 +1739,20 @@ namespace cairocanvas } // XIntegerBitmapColorSpace - virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) override { return 32; } - virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) override { return maBitCounts; } - virtual ::sal_Int8 SAL_CALL getEndianness( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int8 SAL_CALL getEndianness( ) override { return util::Endianness::LITTLE; } virtual uno::Sequence SAL_CALL convertFromIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor, - const uno::Reference< rendering::XColorSpace >& targetColorSpace ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + const uno::Reference< rendering::XColorSpace >& targetColorSpace ) override { if( dynamic_cast(targetColorSpace.get()) ) { @@ -1785,8 +1783,7 @@ namespace cairocanvas } } virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertToIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor, - const uno::Reference< rendering::XIntegerBitmapColorSpace >& targetColorSpace ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + const uno::Reference< rendering::XIntegerBitmapColorSpace >& targetColorSpace ) override { if( dynamic_cast(targetColorSpace.get()) ) { @@ -1802,8 +1799,7 @@ namespace cairocanvas return targetColorSpace->convertIntegerFromARGB(aIntermediate); } } - virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) override { const sal_Int8* pIn( deviceColor.getConstArray() ); const std::size_t nLen( deviceColor.getLength() ); @@ -1828,8 +1824,7 @@ namespace cairocanvas return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) override { const sal_Int8* pIn( deviceColor.getConstArray() ); const std::size_t nLen( deviceColor.getLength() ); @@ -1854,8 +1849,7 @@ namespace cairocanvas } return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) override { const sal_Int8* pIn( deviceColor.getConstArray() ); const std::size_t nLen( deviceColor.getLength() ); @@ -1877,8 +1871,7 @@ namespace cairocanvas return aRes; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) override { const rendering::RGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); @@ -1896,8 +1889,7 @@ namespace cairocanvas return aRes; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); @@ -1915,8 +1907,7 @@ namespace cairocanvas } return aRes; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); @@ -1959,25 +1950,24 @@ namespace cairocanvas uno::Sequence< sal_Int8 > maComponentTags; uno::Sequence< sal_Int32 > maBitCounts; - virtual ::sal_Int8 SAL_CALL getType( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int8 SAL_CALL getType( ) override { return rendering::ColorSpaceType::RGB; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags( ) override { return maComponentTags; } - virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) override { return rendering::RenderingIntent::PERCEPTUAL; } - virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties( ) override { return uno::Sequence< beans::PropertyValue >(); } virtual uno::Sequence< double > SAL_CALL convertColorSpace( const uno::Sequence< double >& deviceColor, - const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) override + const uno::Reference< rendering::XColorSpace >& targetColorSpace ) override { // TODO(P3): if we know anything about target // colorspace, this can be greatly sped up @@ -1985,7 +1975,7 @@ namespace cairocanvas convertToARGB(deviceColor)); return targetColorSpace->convertFromARGB(aIntermediate); } - virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) override { const double* pIn( deviceColor.getConstArray() ); const std::size_t nLen( deviceColor.getLength() ); @@ -2019,15 +2009,15 @@ namespace cairocanvas } return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) override { return impl_convertToARGB( deviceColor ); } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) override { return impl_convertToARGB( deviceColor ); } - virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) override { const rendering::RGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); @@ -2061,31 +2051,30 @@ namespace cairocanvas } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override { return impl_convertFromARGB( rgbColor ); } - virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override { return impl_convertFromARGB( rgbColor ); } // XIntegerBitmapColorSpace - virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) override { return 32; } - virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) override { return maBitCounts; } - virtual ::sal_Int8 SAL_CALL getEndianness( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int8 SAL_CALL getEndianness( ) override { return util::Endianness::LITTLE; } virtual uno::Sequence SAL_CALL convertFromIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor, - const uno::Reference< rendering::XColorSpace >& targetColorSpace ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + const uno::Reference< rendering::XColorSpace >& targetColorSpace ) override { if( dynamic_cast(targetColorSpace.get()) ) { @@ -2116,8 +2105,7 @@ namespace cairocanvas } } virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertToIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor, - const uno::Reference< rendering::XIntegerBitmapColorSpace >& targetColorSpace ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + const uno::Reference< rendering::XIntegerBitmapColorSpace >& targetColorSpace ) override { if( dynamic_cast(targetColorSpace.get()) ) { @@ -2133,8 +2121,7 @@ namespace cairocanvas return targetColorSpace->convertIntegerFromARGB(aIntermediate); } } - virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) override { const sal_Int8* pIn( deviceColor.getConstArray() ); const std::size_t nLen( deviceColor.getLength() ); @@ -2152,13 +2139,11 @@ namespace cairocanvas return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) override { return impl_convertIntegerToARGB( deviceColor ); } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) override { return impl_convertIntegerToARGB( deviceColor ); } @@ -2184,8 +2169,7 @@ namespace cairocanvas return aRes; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) override { const rendering::RGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); @@ -2203,13 +2187,11 @@ namespace cairocanvas return aRes; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override { return impl_convertIntegerFromARGB( rgbColor ); } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override { return impl_convertIntegerFromARGB( rgbColor ); } diff --git a/canvas/source/cairo/cairo_spritecanvas.cxx b/canvas/source/cairo/cairo_spritecanvas.cxx index 906c220115ec..3370a9513b9f 100644 --- a/canvas/source/cairo/cairo_spritecanvas.cxx +++ b/canvas/source/cairo/cairo_spritecanvas.cxx @@ -115,17 +115,17 @@ namespace cairocanvas SpriteCanvasBaseT::disposeThis(); } - sal_Bool SAL_CALL SpriteCanvas::showBuffer( sal_Bool bUpdateAll ) throw (uno::RuntimeException, std::exception) + sal_Bool SAL_CALL SpriteCanvas::showBuffer( sal_Bool bUpdateAll ) { return updateScreen( bUpdateAll ); } - sal_Bool SAL_CALL SpriteCanvas::switchBuffer( sal_Bool bUpdateAll ) throw (uno::RuntimeException) + sal_Bool SAL_CALL SpriteCanvas::switchBuffer( sal_Bool bUpdateAll ) { return updateScreen( bUpdateAll ); } - sal_Bool SAL_CALL SpriteCanvas::updateScreen( sal_Bool bUpdateAll ) throw (uno::RuntimeException, std::exception) + sal_Bool SAL_CALL SpriteCanvas::updateScreen( sal_Bool bUpdateAll ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -138,7 +138,7 @@ namespace cairocanvas mbSurfaceDirty); } - OUString SAL_CALL SpriteCanvas::getServiceName( ) throw (uno::RuntimeException, std::exception) + OUString SAL_CALL SpriteCanvas::getServiceName( ) { return OUString( SPRITECANVAS_SERVICE_NAME ); } diff --git a/canvas/source/cairo/cairo_spritecanvas.hxx b/canvas/source/cairo/cairo_spritecanvas.hxx index 9a3b61aaeb75..ee0b14d9e654 100644 --- a/canvas/source/cairo/cairo_spritecanvas.hxx +++ b/canvas/source/cairo/cairo_spritecanvas.hxx @@ -121,14 +121,14 @@ namespace cairocanvas DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( SpriteCanvas, WindowGraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase ) // XBufferController (partial) - virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL switchBuffer( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) override; + virtual sal_Bool SAL_CALL switchBuffer( sal_Bool bUpdateAll ) override; // XSpriteCanvas (partial) - virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) override; // XServiceName - virtual OUString SAL_CALL getServiceName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName( ) override; // SurfaceProvider virtual ::cairo::SurfaceSharedPtr getSurface() override; diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx index 24efd369e062..eaf439923992 100644 --- a/canvas/source/cairo/cairo_textlayout.cxx +++ b/canvas/source/cairo/cairo_textlayout.cxx @@ -107,32 +107,32 @@ namespace cairocanvas } // XTextLayout - uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > > SAL_CALL TextLayout::queryTextShapes( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > > SAL_CALL TextLayout::queryTextShapes( ) { // TODO return uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > >(); } - uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryInkMeasures( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryInkMeasures( ) { // TODO return uno::Sequence< geometry::RealRectangle2D >(); } - uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryMeasures( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryMeasures( ) { // TODO return uno::Sequence< geometry::RealRectangle2D >(); } - uno::Sequence< double > SAL_CALL TextLayout::queryLogicalAdvancements( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< double > SAL_CALL TextLayout::queryLogicalAdvancements( ) { ::osl::MutexGuard aGuard( m_aMutex ); return maLogicalAdvancements; } - void SAL_CALL TextLayout::applyLogicalAdvancements( const uno::Sequence< double >& aAdvancements ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) + void SAL_CALL TextLayout::applyLogicalAdvancements( const uno::Sequence< double >& aAdvancements ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -145,7 +145,7 @@ namespace cairocanvas maLogicalAdvancements = aAdvancements; } - geometry::RealRectangle2D SAL_CALL TextLayout::queryTextBounds( ) throw (uno::RuntimeException, std::exception) + geometry::RealRectangle2D SAL_CALL TextLayout::queryTextBounds( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -182,27 +182,27 @@ namespace cairocanvas } } - double SAL_CALL TextLayout::justify( double /*nSize*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) + double SAL_CALL TextLayout::justify( double /*nSize*/ ) { // TODO return 0.0; } double SAL_CALL TextLayout::combinedJustify( const uno::Sequence< uno::Reference< rendering::XTextLayout > >& /*aNextLayouts*/, - double /*nSize*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) + double /*nSize*/ ) { // TODO return 0.0; } - rendering::TextHit SAL_CALL TextLayout::getTextHit( const geometry::RealPoint2D& /*aHitPoint*/ ) throw (uno::RuntimeException, std::exception) + rendering::TextHit SAL_CALL TextLayout::getTextHit( const geometry::RealPoint2D& /*aHitPoint*/ ) { // TODO return rendering::TextHit(); } rendering::Caret SAL_CALL TextLayout::getCaret( sal_Int32 /*nInsertionIndex*/, - sal_Bool /*bExcludeLigatures*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + sal_Bool /*bExcludeLigatures*/ ) { // TODO return rendering::Caret(); @@ -210,47 +210,47 @@ namespace cairocanvas sal_Int32 SAL_CALL TextLayout::getNextInsertionIndex( sal_Int32 /*nStartIndex*/, sal_Int32 /*nCaretAdvancement*/, - sal_Bool /*bExcludeLigatures*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + sal_Bool /*bExcludeLigatures*/ ) { // TODO return 0; } uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryVisualHighlighting( sal_Int32 /*nStartIndex*/, - sal_Int32 /*nEndIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + sal_Int32 /*nEndIndex*/ ) { // TODO return uno::Reference< rendering::XPolyPolygon2D >(); } uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryLogicalHighlighting( sal_Int32 /*nStartIndex*/, - sal_Int32 /*nEndIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + sal_Int32 /*nEndIndex*/ ) { // TODO return uno::Reference< rendering::XPolyPolygon2D >(); } - double SAL_CALL TextLayout::getBaselineOffset( ) throw (uno::RuntimeException, std::exception) + double SAL_CALL TextLayout::getBaselineOffset( ) { // TODO return 0.0; } - sal_Int8 SAL_CALL TextLayout::getMainTextDirection( ) throw (uno::RuntimeException, std::exception) + sal_Int8 SAL_CALL TextLayout::getMainTextDirection( ) { ::osl::MutexGuard aGuard( m_aMutex ); return mnTextDirection; } - uno::Reference< rendering::XCanvasFont > SAL_CALL TextLayout::getFont( ) throw (uno::RuntimeException, std::exception) + uno::Reference< rendering::XCanvasFont > SAL_CALL TextLayout::getFont( ) { ::osl::MutexGuard aGuard( m_aMutex ); return mpFont.get(); } - rendering::StringContext SAL_CALL TextLayout::getText( ) throw (uno::RuntimeException, std::exception) + rendering::StringContext SAL_CALL TextLayout::getText( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -559,17 +559,17 @@ namespace cairocanvas OffsetTransformer( aMatrix ) ); } - OUString SAL_CALL TextLayout::getImplementationName() throw( uno::RuntimeException, std::exception ) + OUString SAL_CALL TextLayout::getImplementationName() { return OUString( "CairoCanvas::TextLayout" ); } - sal_Bool SAL_CALL TextLayout::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception ) + sal_Bool SAL_CALL TextLayout::supportsService( const OUString& ServiceName ) { return cppu::supportsService( this, ServiceName ); } - uno::Sequence< OUString > SAL_CALL TextLayout::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) + uno::Sequence< OUString > SAL_CALL TextLayout::getSupportedServiceNames() { return { "com.sun.star.rendering.TextLayout" }; } diff --git a/canvas/source/cairo/cairo_textlayout.hxx b/canvas/source/cairo/cairo_textlayout.hxx index e39ce77457f0..b3db7803b2fa 100644 --- a/canvas/source/cairo/cairo_textlayout.hxx +++ b/canvas/source/cairo/cairo_textlayout.hxx @@ -59,28 +59,28 @@ namespace cairocanvas virtual void SAL_CALL disposing() override; // XTextLayout - virtual css::uno::Sequence< css::uno::Reference< css::rendering::XPolyPolygon2D > > SAL_CALL queryTextShapes( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryInkMeasures( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryMeasures( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< double > SAL_CALL queryLogicalAdvancements( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL applyLogicalAdvancements( const css::uno::Sequence< double >& aAdvancements ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::geometry::RealRectangle2D SAL_CALL queryTextBounds( ) throw (css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL justify( double nSize ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL combinedJustify( const css::uno::Sequence< css::uno::Reference< css::rendering::XTextLayout > >& aNextLayouts, double nSize ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::rendering::TextHit SAL_CALL getTextHit( const css::geometry::RealPoint2D& aHitPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::rendering::Caret SAL_CALL getCaret( sal_Int32 nInsertionIndex, sal_Bool bExcludeLigatures ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getNextInsertionIndex( sal_Int32 nStartIndex, sal_Int32 nCaretAdvancement, sal_Bool bExcludeLigatures ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryVisualHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryLogicalHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getBaselineOffset( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int8 SAL_CALL getMainTextDirection( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::rendering::XCanvasFont > SAL_CALL getFont( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::rendering::StringContext SAL_CALL getText( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::rendering::XPolyPolygon2D > > SAL_CALL queryTextShapes( ) override; + virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryInkMeasures( ) override; + virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryMeasures( ) override; + virtual css::uno::Sequence< double > SAL_CALL queryLogicalAdvancements( ) override; + virtual void SAL_CALL applyLogicalAdvancements( const css::uno::Sequence< double >& aAdvancements ) override; + virtual css::geometry::RealRectangle2D SAL_CALL queryTextBounds( ) override; + virtual double SAL_CALL justify( double nSize ) override; + virtual double SAL_CALL combinedJustify( const css::uno::Sequence< css::uno::Reference< css::rendering::XTextLayout > >& aNextLayouts, double nSize ) override; + virtual css::rendering::TextHit SAL_CALL getTextHit( const css::geometry::RealPoint2D& aHitPoint ) override; + virtual css::rendering::Caret SAL_CALL getCaret( sal_Int32 nInsertionIndex, sal_Bool bExcludeLigatures ) override; + virtual sal_Int32 SAL_CALL getNextInsertionIndex( sal_Int32 nStartIndex, sal_Int32 nCaretAdvancement, sal_Bool bExcludeLigatures ) override; + virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryVisualHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryLogicalHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual double SAL_CALL getBaselineOffset( ) override; + virtual sal_Int8 SAL_CALL getMainTextDirection( ) override; + virtual css::uno::Reference< css::rendering::XCanvasFont > SAL_CALL getFont( ) override; + virtual css::rendering::StringContext SAL_CALL getText( ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; bool draw( ::cairo::CairoSharedPtr& pSCairo, OutputDevice& rOutDev, diff --git a/canvas/source/directx/dx_canvas.cxx b/canvas/source/directx/dx_canvas.cxx index b42f2ab92d56..3fa91396ee47 100644 --- a/canvas/source/directx/dx_canvas.cxx +++ b/canvas/source/directx/dx_canvas.cxx @@ -126,7 +126,7 @@ namespace dxcanvas CanvasBaseT::disposeThis(); } - OUString SAL_CALL Canvas::getServiceName( ) throw (uno::RuntimeException) + OUString SAL_CALL Canvas::getServiceName( ) { return OUString( CANVAS_SERVICE_NAME ); } @@ -202,7 +202,7 @@ namespace dxcanvas BitmapCanvasBaseT::disposeThis(); } - OUString SAL_CALL BitmapCanvas::getServiceName( ) throw (uno::RuntimeException) + OUString SAL_CALL BitmapCanvas::getServiceName( ) { return OUString( BITMAPCANVAS_SERVICE_NAME ); } diff --git a/canvas/source/directx/dx_canvas.hxx b/canvas/source/directx/dx_canvas.hxx index 8648d31a2d70..e690ca04f073 100644 --- a/canvas/source/directx/dx_canvas.hxx +++ b/canvas/source/directx/dx_canvas.hxx @@ -92,7 +92,7 @@ namespace dxcanvas DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( Canvas, GraphicDeviceBase1_Base, ::cppu::WeakComponentImplHelperBase ) // XServiceName - virtual OUString SAL_CALL getServiceName( ) throw (css::uno::RuntimeException) override; + virtual OUString SAL_CALL getServiceName( ) override; private: css::uno::Sequence< css::uno::Any > maArguments; @@ -148,7 +148,7 @@ namespace dxcanvas DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( BitmapCanvas, GraphicDeviceBase2_Base, ::cppu::WeakComponentImplHelperBase ) // XServiceName - virtual OUString SAL_CALL getServiceName( ) throw (css::uno::RuntimeException) override; + virtual OUString SAL_CALL getServiceName( ) override; // BitmapProvider virtual IBitmapSharedPtr getBitmap() const override; diff --git a/canvas/source/directx/dx_canvasbitmap.cxx b/canvas/source/directx/dx_canvasbitmap.cxx index 1b86f9c98f0e..edc1c0ace2cc 100644 --- a/canvas/source/directx/dx_canvasbitmap.cxx +++ b/canvas/source/directx/dx_canvasbitmap.cxx @@ -74,7 +74,7 @@ namespace dxcanvas } }; - uno::Any SAL_CALL CanvasBitmap::getFastPropertyValue( sal_Int32 nHandle ) throw (uno::RuntimeException) + uno::Any SAL_CALL CanvasBitmap::getFastPropertyValue( sal_Int32 nHandle ) { uno::Any aRes; // 0 ... get BitmapEx @@ -239,17 +239,17 @@ namespace dxcanvas return aRes; } - OUString SAL_CALL CanvasBitmap::getImplementationName( ) throw (uno::RuntimeException) + OUString SAL_CALL CanvasBitmap::getImplementationName( ) { return OUString( "DXCanvas.CanvasBitmap" ); } - sal_Bool SAL_CALL CanvasBitmap::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException) + sal_Bool SAL_CALL CanvasBitmap::supportsService( const OUString& ServiceName ) { return cppu::supportsService( this, ServiceName ); } - uno::Sequence< OUString > SAL_CALL CanvasBitmap::getSupportedServiceNames( ) throw (uno::RuntimeException) + uno::Sequence< OUString > SAL_CALL CanvasBitmap::getSupportedServiceNames( ) { return { "com.sun.star.rendering.CanvasBitmap" }; } diff --git a/canvas/source/directx/dx_canvasbitmap.hxx b/canvas/source/directx/dx_canvasbitmap.hxx index 53c8b2b7a7f0..a547717e656d 100644 --- a/canvas/source/directx/dx_canvasbitmap.hxx +++ b/canvas/source/directx/dx_canvasbitmap.hxx @@ -70,15 +70,15 @@ namespace dxcanvas virtual void disposeThis() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // BitmapProvider virtual IBitmapSharedPtr getBitmap() const override { return mpBitmap; } - virtual css::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL setFastPropertyValue(sal_Int32, const css::uno::Any&) throw (css::uno::RuntimeException) override {} + virtual css::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) override; + virtual void SAL_CALL setFastPropertyValue(sal_Int32, const css::uno::Any&) override {} private: /** MUST hold here, too, since CanvasHelper only contains a diff --git a/canvas/source/directx/dx_canvascustomsprite.cxx b/canvas/source/directx/dx_canvascustomsprite.cxx index 148f2636b50d..b0e4b740ef67 100644 --- a/canvas/source/directx/dx_canvascustomsprite.cxx +++ b/canvas/source/directx/dx_canvascustomsprite.cxx @@ -81,17 +81,17 @@ namespace dxcanvas CanvasCustomSpriteBaseT::disposeThis(); } - OUString SAL_CALL CanvasCustomSprite::getImplementationName() throw( uno::RuntimeException ) + OUString SAL_CALL CanvasCustomSprite::getImplementationName() { return OUString( "DXCanvas.CanvasCustomSprite" ); } - sal_Bool SAL_CALL CanvasCustomSprite::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException ) + sal_Bool SAL_CALL CanvasCustomSprite::supportsService( const OUString& ServiceName ) { return cppu::supportsService( this, ServiceName ); } - uno::Sequence< OUString > SAL_CALL CanvasCustomSprite::getSupportedServiceNames() throw( uno::RuntimeException ) + uno::Sequence< OUString > SAL_CALL CanvasCustomSprite::getSupportedServiceNames() { return { "com.sun.star.rendering.CanvasCustomSprite" }; } diff --git a/canvas/source/directx/dx_canvascustomsprite.hxx b/canvas/source/directx/dx_canvascustomsprite.hxx index c53c84616788..a3b57917ed7b 100644 --- a/canvas/source/directx/dx_canvascustomsprite.hxx +++ b/canvas/source/directx/dx_canvascustomsprite.hxx @@ -112,9 +112,9 @@ namespace dxcanvas DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasCustomSprite, CanvasCustomSpriteBase_Base, ::cppu::WeakComponentImplHelperBase ) // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // Sprite virtual void redraw() const override; diff --git a/canvas/source/directx/dx_canvasfont.cxx b/canvas/source/directx/dx_canvasfont.cxx index d3274b03560c..58a22da907ef 100644 --- a/canvas/source/directx/dx_canvasfont.cxx +++ b/canvas/source/directx/dx_canvasfont.cxx @@ -84,49 +84,49 @@ namespace dxcanvas uno::Reference< rendering::XTextLayout > SAL_CALL CanvasFont::createTextLayout( const rendering::StringContext& aText, sal_Int8 nDirection, - sal_Int64 nRandomSeed ) throw (uno::RuntimeException) + sal_Int64 nRandomSeed ) { ::osl::MutexGuard aGuard( m_aMutex ); return new TextLayout( aText, nDirection, nRandomSeed, ImplRef( this ) ); } - uno::Sequence< double > SAL_CALL CanvasFont::getAvailableSizes( ) throw (uno::RuntimeException) + uno::Sequence< double > SAL_CALL CanvasFont::getAvailableSizes( ) { // TODO return uno::Sequence< double >(); } - uno::Sequence< beans::PropertyValue > SAL_CALL CanvasFont::getExtraFontProperties( ) throw (uno::RuntimeException) + uno::Sequence< beans::PropertyValue > SAL_CALL CanvasFont::getExtraFontProperties( ) { // TODO return uno::Sequence< beans::PropertyValue >(); } - rendering::FontRequest SAL_CALL CanvasFont::getFontRequest( ) throw (uno::RuntimeException) + rendering::FontRequest SAL_CALL CanvasFont::getFontRequest( ) { ::osl::MutexGuard aGuard( m_aMutex ); return maFontRequest; } - rendering::FontMetrics SAL_CALL CanvasFont::getFontMetrics( ) throw (uno::RuntimeException) + rendering::FontMetrics SAL_CALL CanvasFont::getFontMetrics( ) { // TODO return rendering::FontMetrics(); } - OUString SAL_CALL CanvasFont::getImplementationName() throw( uno::RuntimeException ) + OUString SAL_CALL CanvasFont::getImplementationName() { return OUString( "DXCanvas::CanvasFont" ); } - sal_Bool SAL_CALL CanvasFont::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException ) + sal_Bool SAL_CALL CanvasFont::supportsService( const OUString& ServiceName ) { return cppu::supportsService( this, ServiceName ); } - uno::Sequence< OUString > SAL_CALL CanvasFont::getSupportedServiceNames() throw( uno::RuntimeException ) + uno::Sequence< OUString > SAL_CALL CanvasFont::getSupportedServiceNames() { return { "com.sun.star.rendering.CanvasFont" }; } diff --git a/canvas/source/directx/dx_canvasfont.hxx b/canvas/source/directx/dx_canvasfont.hxx index 533f78c5eebb..7d463a386ae2 100644 --- a/canvas/source/directx/dx_canvasfont.hxx +++ b/canvas/source/directx/dx_canvasfont.hxx @@ -62,16 +62,16 @@ namespace dxcanvas virtual void SAL_CALL disposing() override; // XCanvasFont - virtual css::uno::Reference< css::rendering::XTextLayout > SAL_CALL createTextLayout( const css::rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) throw (css::uno::RuntimeException) override; - virtual css::rendering::FontRequest SAL_CALL getFontRequest( ) throw (css::uno::RuntimeException) override; - virtual css::rendering::FontMetrics SAL_CALL getFontMetrics( ) throw (css::uno::RuntimeException) override; - virtual css::uno::Sequence< double > SAL_CALL getAvailableSizes( ) throw (css::uno::RuntimeException) override; - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getExtraFontProperties( ) throw (css::uno::RuntimeException) override; + virtual css::uno::Reference< css::rendering::XTextLayout > SAL_CALL createTextLayout( const css::rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) override; + virtual css::rendering::FontRequest SAL_CALL getFontRequest( ) override; + virtual css::rendering::FontMetrics SAL_CALL getFontMetrics( ) override; + virtual css::uno::Sequence< double > SAL_CALL getAvailableSizes( ) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getExtraFontProperties( ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; double getCellAscent() const; double getEmHeight() const; diff --git a/canvas/source/directx/dx_spritecanvas.cxx b/canvas/source/directx/dx_spritecanvas.cxx index 5c65c336e6a4..9fbd2d5dc154 100644 --- a/canvas/source/directx/dx_spritecanvas.cxx +++ b/canvas/source/directx/dx_spritecanvas.cxx @@ -116,7 +116,7 @@ namespace dxcanvas SpriteCanvasBaseT::disposeThis(); } - sal_Bool SAL_CALL SpriteCanvas::showBuffer( sal_Bool bUpdateAll ) throw (uno::RuntimeException) + sal_Bool SAL_CALL SpriteCanvas::showBuffer( sal_Bool bUpdateAll ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -126,7 +126,7 @@ namespace dxcanvas return mbIsVisible && SpriteCanvasBaseT::showBuffer( bUpdateAll ); } - sal_Bool SAL_CALL SpriteCanvas::switchBuffer( sal_Bool bUpdateAll ) throw (uno::RuntimeException) + sal_Bool SAL_CALL SpriteCanvas::switchBuffer( sal_Bool bUpdateAll ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -136,7 +136,7 @@ namespace dxcanvas return mbIsVisible && SpriteCanvasBaseT::switchBuffer( bUpdateAll ); } - sal_Bool SAL_CALL SpriteCanvas::updateScreen( sal_Bool bUpdateAll ) throw (uno::RuntimeException) + sal_Bool SAL_CALL SpriteCanvas::updateScreen( sal_Bool bUpdateAll ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -149,7 +149,7 @@ namespace dxcanvas mbSurfaceDirty ); } - OUString SAL_CALL SpriteCanvas::getServiceName( ) throw (uno::RuntimeException) + OUString SAL_CALL SpriteCanvas::getServiceName( ) { return OUString( SPRITECANVAS_SERVICE_NAME ); } diff --git a/canvas/source/directx/dx_spritecanvas.hxx b/canvas/source/directx/dx_spritecanvas.hxx index 04471f8a509b..f57cbe5eee27 100644 --- a/canvas/source/directx/dx_spritecanvas.hxx +++ b/canvas/source/directx/dx_spritecanvas.hxx @@ -118,14 +118,14 @@ namespace dxcanvas DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( SpriteCanvas, WindowGraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase ) // XBufferController (partial) - virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL switchBuffer( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) override; + virtual sal_Bool SAL_CALL switchBuffer( sal_Bool bUpdateAll ) override; // XSpriteCanvas (partial) - virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) override; // XServiceName - virtual OUString SAL_CALL getServiceName( ) throw (css::uno::RuntimeException) override; + virtual OUString SAL_CALL getServiceName( ) override; /// Retrieve rendermodule object for this Canvas const IDXRenderModuleSharedPtr& getRenderModule() const; diff --git a/canvas/source/directx/dx_textlayout.cxx b/canvas/source/directx/dx_textlayout.cxx index 84fa7181ef62..e96822a29b3c 100644 --- a/canvas/source/directx/dx_textlayout.cxx +++ b/canvas/source/directx/dx_textlayout.cxx @@ -56,32 +56,32 @@ namespace dxcanvas } // XTextLayout - uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > > SAL_CALL TextLayout::queryTextShapes( ) throw (uno::RuntimeException) + uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > > SAL_CALL TextLayout::queryTextShapes( ) { // TODO return uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > >(); } - uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryInkMeasures( ) throw (uno::RuntimeException) + uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryInkMeasures( ) { // TODO return uno::Sequence< geometry::RealRectangle2D >(); } - uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryMeasures( ) throw (uno::RuntimeException) + uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryMeasures( ) { // TODO return uno::Sequence< geometry::RealRectangle2D >(); } - uno::Sequence< double > SAL_CALL TextLayout::queryLogicalAdvancements( ) throw (uno::RuntimeException) + uno::Sequence< double > SAL_CALL TextLayout::queryLogicalAdvancements( ) { ::osl::MutexGuard aGuard( m_aMutex ); return maLogicalAdvancements; } - void SAL_CALL TextLayout::applyLogicalAdvancements( const uno::Sequence< double >& aAdvancements ) throw (lang::IllegalArgumentException, uno::RuntimeException) + void SAL_CALL TextLayout::applyLogicalAdvancements( const uno::Sequence< double >& aAdvancements ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -94,7 +94,7 @@ namespace dxcanvas maLogicalAdvancements = aAdvancements; } - geometry::RealRectangle2D SAL_CALL TextLayout::queryTextBounds( ) throw (uno::RuntimeException) + geometry::RealRectangle2D SAL_CALL TextLayout::queryTextBounds( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -112,27 +112,27 @@ namespace dxcanvas return aBounds; } - double SAL_CALL TextLayout::justify( double /*nSize*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException) + double SAL_CALL TextLayout::justify( double /*nSize*/ ) { // TODO return 0.0; } double SAL_CALL TextLayout::combinedJustify( const uno::Sequence< uno::Reference< rendering::XTextLayout > >& /*aNextLayouts*/, - double /*nSize*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException) + double /*nSize*/ ) { // TODO return 0.0; } - rendering::TextHit SAL_CALL TextLayout::getTextHit( const geometry::RealPoint2D& /*aHitPoint*/ ) throw (uno::RuntimeException) + rendering::TextHit SAL_CALL TextLayout::getTextHit( const geometry::RealPoint2D& /*aHitPoint*/ ) { // TODO return rendering::TextHit(); } rendering::Caret SAL_CALL TextLayout::getCaret( sal_Int32 /*nInsertionIndex*/, - sal_Bool /*bExcludeLigatures*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + sal_Bool /*bExcludeLigatures*/ ) { // TODO return rendering::Caret(); @@ -140,47 +140,47 @@ namespace dxcanvas sal_Int32 SAL_CALL TextLayout::getNextInsertionIndex( sal_Int32 /*nStartIndex*/, sal_Int32 /*nCaretAdvancement*/, - sal_Bool /*bExcludeLigatures*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + sal_Bool /*bExcludeLigatures*/ ) { // TODO return 0; } uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryVisualHighlighting( sal_Int32 /*nStartIndex*/, - sal_Int32 /*nEndIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + sal_Int32 /*nEndIndex*/ ) { // TODO return uno::Reference< rendering::XPolyPolygon2D >(); } uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryLogicalHighlighting( sal_Int32 /*nStartIndex*/, - sal_Int32 /*nEndIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException) + sal_Int32 /*nEndIndex*/ ) { // TODO return uno::Reference< rendering::XPolyPolygon2D >(); } - double SAL_CALL TextLayout::getBaselineOffset( ) throw (uno::RuntimeException) + double SAL_CALL TextLayout::getBaselineOffset( ) { // TODO return 0.0; } - sal_Int8 SAL_CALL TextLayout::getMainTextDirection( ) throw (uno::RuntimeException) + sal_Int8 SAL_CALL TextLayout::getMainTextDirection( ) { ::osl::MutexGuard aGuard( m_aMutex ); return mnTextDirection; } - uno::Reference< rendering::XCanvasFont > SAL_CALL TextLayout::getFont( ) throw (uno::RuntimeException) + uno::Reference< rendering::XCanvasFont > SAL_CALL TextLayout::getFont( ) { ::osl::MutexGuard aGuard( m_aMutex ); return mpFont.get(); } - rendering::StringContext SAL_CALL TextLayout::getText( ) throw (uno::RuntimeException) + rendering::StringContext SAL_CALL TextLayout::getText( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -213,17 +213,17 @@ namespace dxcanvas return true; } - OUString SAL_CALL TextLayout::getImplementationName() throw( uno::RuntimeException ) + OUString SAL_CALL TextLayout::getImplementationName() { return OUString( "DXCanvas::TextLayout" ); } - sal_Bool SAL_CALL TextLayout::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException ) + sal_Bool SAL_CALL TextLayout::supportsService( const OUString& ServiceName ) { return cppu::supportsService( this, ServiceName ); } - uno::Sequence< OUString > SAL_CALL TextLayout::getSupportedServiceNames() throw( uno::RuntimeException ) + uno::Sequence< OUString > SAL_CALL TextLayout::getSupportedServiceNames() { return { "com.sun.star.rendering.TextLayout" }; } diff --git a/canvas/source/directx/dx_textlayout.hxx b/canvas/source/directx/dx_textlayout.hxx index 0cdea204431c..b24a1c8f00dc 100644 --- a/canvas/source/directx/dx_textlayout.hxx +++ b/canvas/source/directx/dx_textlayout.hxx @@ -57,28 +57,28 @@ namespace dxcanvas virtual void SAL_CALL disposing() override; // XTextLayout - virtual css::uno::Sequence< css::uno::Reference< css::rendering::XPolyPolygon2D > > SAL_CALL queryTextShapes( ) throw (css::uno::RuntimeException) override; - virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryInkMeasures( ) throw (css::uno::RuntimeException) override; - virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryMeasures( ) throw (css::uno::RuntimeException) override; - virtual css::uno::Sequence< double > SAL_CALL queryLogicalAdvancements( ) throw (css::uno::RuntimeException) override; - virtual void SAL_CALL applyLogicalAdvancements( const css::uno::Sequence< double >& aAdvancements ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) override; - virtual css::geometry::RealRectangle2D SAL_CALL queryTextBounds( ) throw (css::uno::RuntimeException) override; - virtual double SAL_CALL justify( double nSize ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) override; - virtual double SAL_CALL combinedJustify( const css::uno::Sequence< css::uno::Reference< css::rendering::XTextLayout > >& aNextLayouts, double nSize ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) override; - virtual css::rendering::TextHit SAL_CALL getTextHit( const css::geometry::RealPoint2D& aHitPoint ) throw (css::uno::RuntimeException) override; - virtual css::rendering::Caret SAL_CALL getCaret( sal_Int32 nInsertionIndex, sal_Bool bExcludeLigatures ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getNextInsertionIndex( sal_Int32 nStartIndex, sal_Int32 nCaretAdvancement, sal_Bool bExcludeLigatures ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryVisualHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryLogicalHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException) override; - virtual double SAL_CALL getBaselineOffset( ) throw (css::uno::RuntimeException) override; - virtual sal_Int8 SAL_CALL getMainTextDirection( ) throw (css::uno::RuntimeException) override; - virtual css::uno::Reference< css::rendering::XCanvasFont > SAL_CALL getFont( ) throw (css::uno::RuntimeException) override; - virtual css::rendering::StringContext SAL_CALL getText( ) throw (css::uno::RuntimeException) override; + virtual css::uno::Sequence< css::uno::Reference< css::rendering::XPolyPolygon2D > > SAL_CALL queryTextShapes( ) override; + virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryInkMeasures( ) override; + virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryMeasures( ) override; + virtual css::uno::Sequence< double > SAL_CALL queryLogicalAdvancements( ) override; + virtual void SAL_CALL applyLogicalAdvancements( const css::uno::Sequence< double >& aAdvancements ) override; + virtual css::geometry::RealRectangle2D SAL_CALL queryTextBounds( ) override; + virtual double SAL_CALL justify( double nSize ) override; + virtual double SAL_CALL combinedJustify( const css::uno::Sequence< css::uno::Reference< css::rendering::XTextLayout > >& aNextLayouts, double nSize ) override; + virtual css::rendering::TextHit SAL_CALL getTextHit( const css::geometry::RealPoint2D& aHitPoint ) override; + virtual css::rendering::Caret SAL_CALL getCaret( sal_Int32 nInsertionIndex, sal_Bool bExcludeLigatures ) override; + virtual sal_Int32 SAL_CALL getNextInsertionIndex( sal_Int32 nStartIndex, sal_Int32 nCaretAdvancement, sal_Bool bExcludeLigatures ) override; + virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryVisualHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryLogicalHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual double SAL_CALL getBaselineOffset( ) override; + virtual sal_Int8 SAL_CALL getMainTextDirection( ) override; + virtual css::uno::Reference< css::rendering::XCanvasFont > SAL_CALL getFont( ) override; + virtual css::rendering::StringContext SAL_CALL getText( ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; bool draw( const GraphicsSharedPtr& rGraphics, const css::rendering::ViewState& rViewState, diff --git a/canvas/source/factory/cf_service.cxx b/canvas/source/factory/cf_service.cxx index a174adaae6ee..f72785057e14 100644 --- a/canvas/source/factory/cf_service.cxx +++ b/canvas/source/factory/cf_service.cxx @@ -89,31 +89,26 @@ public: explicit CanvasFactory( Reference const & xContext ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( OUString const & serviceName ) - throw (RuntimeException, std::exception) override; - virtual Sequence SAL_CALL getSupportedServiceNames() - throw (RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( OUString const & serviceName ) override; + virtual Sequence SAL_CALL getSupportedServiceNames() override; // XMultiComponentFactory - virtual Sequence SAL_CALL getAvailableServiceNames() - throw (RuntimeException, std::exception) override; + virtual Sequence SAL_CALL getAvailableServiceNames() override; virtual Reference SAL_CALL createInstanceWithContext( OUString const & name, - Reference const & xContext ) throw (Exception, std::exception) override; + Reference const & xContext ) override; virtual Reference SAL_CALL createInstanceWithArgumentsAndContext( OUString const & name, Sequence const & args, - Reference const & xContext ) throw (Exception, std::exception) override; + Reference const & xContext ) override; // XMultiServiceFactory virtual Reference SAL_CALL createInstance( - OUString const & name ) - throw (Exception, std::exception) override; + OUString const & name ) override; virtual Reference SAL_CALL createInstanceWithArguments( - OUString const & name, Sequence const & args ) - throw (Exception, std::exception) override; + OUString const & name, Sequence const & args ) override; }; CanvasFactory::CanvasFactory( Reference const & xContext ) : @@ -217,26 +212,23 @@ CanvasFactory::~CanvasFactory() // XServiceInfo -OUString CanvasFactory::getImplementationName() throw (RuntimeException, std::exception) +OUString CanvasFactory::getImplementationName() { return OUString("com.sun.star.comp.rendering.CanvasFactory"); } sal_Bool CanvasFactory::supportsService( OUString const & serviceName ) - throw (RuntimeException, std::exception) { return cppu::supportsService(this, serviceName); } Sequence CanvasFactory::getSupportedServiceNames() - throw (RuntimeException, std::exception) { return { "com.sun.star.rendering.CanvasFactory" }; } // XMultiComponentFactory Sequence CanvasFactory::getAvailableServiceNames() - throw (RuntimeException, std::exception) { Sequence aServiceNames(m_aAvailableImplementations.size()); std::transform(m_aAvailableImplementations.begin(), @@ -248,7 +240,6 @@ Sequence CanvasFactory::getAvailableServiceNames() Reference CanvasFactory::createInstanceWithContext( OUString const & name, Reference const & xContext ) - throw (Exception, std::exception) { return createInstanceWithArgumentsAndContext( name, Sequence(), xContext ); @@ -453,7 +444,7 @@ Reference CanvasFactory::lookupAndUse( Reference CanvasFactory::createInstanceWithArgumentsAndContext( OUString const & preferredOne, Sequence const & args, - Reference const & xContext ) throw (Exception, std::exception) + Reference const & xContext ) { Reference xCanvas( lookupAndUse( preferredOne, args, xContext ) ); @@ -467,7 +458,6 @@ Reference CanvasFactory::createInstanceWithArgumentsAndContext( // XMultiServiceFactory Reference CanvasFactory::createInstance( OUString const & name ) - throw (Exception, std::exception) { return createInstanceWithArgumentsAndContext( name, Sequence(), m_xContext ); @@ -475,7 +465,7 @@ Reference CanvasFactory::createInstance( OUString const & name ) Reference CanvasFactory::createInstanceWithArguments( - OUString const & name, Sequence const & args ) throw (Exception, std::exception) + OUString const & name, Sequence const & args ) { return createInstanceWithArgumentsAndContext( name, args, m_xContext ); diff --git a/canvas/source/opengl/ogl_canvascustomsprite.cxx b/canvas/source/opengl/ogl_canvascustomsprite.cxx index 6b23d4504740..d16659896fc4 100644 --- a/canvas/source/opengl/ogl_canvascustomsprite.cxx +++ b/canvas/source/opengl/ogl_canvascustomsprite.cxx @@ -58,8 +58,7 @@ namespace oglcanvas CanvasCustomSpriteBaseT::disposeThis(); } - void SAL_CALL CanvasCustomSprite::setAlpha( double alpha ) throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) + void SAL_CALL CanvasCustomSprite::setAlpha( double alpha ) { canvas::tools::verifyRange( alpha, 0.0, 1.0 ); @@ -69,8 +68,7 @@ namespace oglcanvas void SAL_CALL CanvasCustomSprite::move( const geometry::RealPoint2D& aNewPos, const rendering::ViewState& viewState, - const rendering::RenderState& renderState ) throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) + const rendering::RenderState& renderState ) { canvas::tools::verifyArgs(aNewPos, viewState, renderState, OSL_THIS_FUNC, @@ -87,39 +85,38 @@ namespace oglcanvas maPosition *= aTransform; } - void SAL_CALL CanvasCustomSprite::transform( const geometry::AffineMatrix2D& aTransformation ) throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) + void SAL_CALL CanvasCustomSprite::transform( const geometry::AffineMatrix2D& aTransformation ) { ::osl::MutexGuard aGuard( m_aMutex ); maTransformation = aTransformation; } - void SAL_CALL CanvasCustomSprite::clip( const uno::Reference< rendering::XPolyPolygon2D >& xClip ) throw (uno::RuntimeException, std::exception) + void SAL_CALL CanvasCustomSprite::clip( const uno::Reference< rendering::XPolyPolygon2D >& xClip ) { mxClip = xClip; } - void SAL_CALL CanvasCustomSprite::setPriority( double nPriority ) throw (uno::RuntimeException, std::exception) + void SAL_CALL CanvasCustomSprite::setPriority( double nPriority ) { ::osl::MutexGuard aGuard( m_aMutex ); mfPriority = nPriority; } - void SAL_CALL CanvasCustomSprite::show() throw (uno::RuntimeException, std::exception) + void SAL_CALL CanvasCustomSprite::show() { ::osl::MutexGuard aGuard( m_aMutex ); if( mpSpriteCanvas.is() ) mpSpriteCanvas->show(this); } - void SAL_CALL CanvasCustomSprite::hide() throw (uno::RuntimeException, std::exception) + void SAL_CALL CanvasCustomSprite::hide() { ::osl::MutexGuard aGuard( m_aMutex ); if( mpSpriteCanvas.is() ) mpSpriteCanvas->hide(this); } - uno::Reference< rendering::XCanvas > SAL_CALL CanvasCustomSprite::getContentCanvas() throw (uno::RuntimeException, std::exception) + uno::Reference< rendering::XCanvas > SAL_CALL CanvasCustomSprite::getContentCanvas() { return this; } diff --git a/canvas/source/opengl/ogl_canvascustomsprite.hxx b/canvas/source/opengl/ogl_canvascustomsprite.hxx index bad063e19a71..c26d955c8ea6 100644 --- a/canvas/source/opengl/ogl_canvascustomsprite.hxx +++ b/canvas/source/opengl/ogl_canvascustomsprite.hxx @@ -63,16 +63,16 @@ namespace oglcanvas virtual void disposeThis() override; // XSprite - virtual void SAL_CALL setAlpha( double alpha ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL move( const css::geometry::RealPoint2D& aNewPos, const css::rendering::ViewState& viewState, const css::rendering::RenderState& renderState ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL transform( const css::geometry::AffineMatrix2D& aTransformation ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clip( const css::uno::Reference< css::rendering::XPolyPolygon2D >& aClip ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPriority( double nPriority ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL show() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL hide() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setAlpha( double alpha ) override; + virtual void SAL_CALL move( const css::geometry::RealPoint2D& aNewPos, const css::rendering::ViewState& viewState, const css::rendering::RenderState& renderState ) override; + virtual void SAL_CALL transform( const css::geometry::AffineMatrix2D& aTransformation ) override; + virtual void SAL_CALL clip( const css::uno::Reference< css::rendering::XPolyPolygon2D >& aClip ) override; + virtual void SAL_CALL setPriority( double nPriority ) override; + virtual void SAL_CALL show() override; + virtual void SAL_CALL hide() override; // XCustomSprite - virtual css::uno::Reference< css::rendering::XCanvas > SAL_CALL getContentCanvas() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::rendering::XCanvas > SAL_CALL getContentCanvas() override; double getPriority() const { return mfPriority; } diff --git a/canvas/source/opengl/ogl_canvasfont.cxx b/canvas/source/opengl/ogl_canvasfont.cxx index e129a5c9e890..0434bb0856cb 100644 --- a/canvas/source/opengl/ogl_canvasfont.cxx +++ b/canvas/source/opengl/ogl_canvasfont.cxx @@ -31,33 +31,33 @@ namespace oglcanvas uno::Reference< rendering::XTextLayout > SAL_CALL CanvasFont::createTextLayout( const rendering::StringContext& aText, sal_Int8 nDirection, - sal_Int64 nRandomSeed ) throw (uno::RuntimeException, std::exception) + sal_Int64 nRandomSeed ) { ::osl::MutexGuard aGuard( m_aMutex ); return new TextLayout( aText, nDirection, nRandomSeed, ImplRef( this ) ); } - uno::Sequence< double > SAL_CALL CanvasFont::getAvailableSizes( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< double > SAL_CALL CanvasFont::getAvailableSizes( ) { // TODO return uno::Sequence< double >(); } - uno::Sequence< beans::PropertyValue > SAL_CALL CanvasFont::getExtraFontProperties( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< beans::PropertyValue > SAL_CALL CanvasFont::getExtraFontProperties( ) { // TODO return uno::Sequence< beans::PropertyValue >(); } - rendering::FontRequest SAL_CALL CanvasFont::getFontRequest( ) throw (uno::RuntimeException, std::exception) + rendering::FontRequest SAL_CALL CanvasFont::getFontRequest( ) { ::osl::MutexGuard aGuard( m_aMutex ); return maFontRequest; } - rendering::FontMetrics SAL_CALL CanvasFont::getFontMetrics( ) throw (uno::RuntimeException, std::exception) + rendering::FontMetrics SAL_CALL CanvasFont::getFontMetrics( ) { // TODO return rendering::FontMetrics(); diff --git a/canvas/source/opengl/ogl_canvasfont.hxx b/canvas/source/opengl/ogl_canvasfont.hxx index 9aca57f7044a..1743bc3c985e 100644 --- a/canvas/source/opengl/ogl_canvasfont.hxx +++ b/canvas/source/opengl/ogl_canvasfont.hxx @@ -42,11 +42,11 @@ namespace oglcanvas const css::geometry::Matrix2D& fontMatrix ); // XCanvasFont - virtual css::uno::Reference< css::rendering::XTextLayout > SAL_CALL createTextLayout( const css::rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::rendering::FontRequest SAL_CALL getFontRequest( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::rendering::FontMetrics SAL_CALL getFontMetrics( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< double > SAL_CALL getAvailableSizes( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getExtraFontProperties( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::rendering::XTextLayout > SAL_CALL createTextLayout( const css::rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) override; + virtual css::rendering::FontRequest SAL_CALL getFontRequest( ) override; + virtual css::rendering::FontMetrics SAL_CALL getFontMetrics( ) override; + virtual css::uno::Sequence< double > SAL_CALL getAvailableSizes( ) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getExtraFontProperties( ) override; const css::geometry::Matrix2D& getFontMatrix() const { return maFontMatrix; } diff --git a/canvas/source/opengl/ogl_spritecanvas.cxx b/canvas/source/opengl/ogl_spritecanvas.cxx index 8e9cbb8636ff..17ae212764b7 100644 --- a/canvas/source/opengl/ogl_spritecanvas.cxx +++ b/canvas/source/opengl/ogl_spritecanvas.cxx @@ -88,7 +88,7 @@ namespace oglcanvas SpriteCanvasBaseT::disposeThis(); } - sal_Bool SAL_CALL SpriteCanvas::showBuffer( sal_Bool bUpdateAll ) throw (uno::RuntimeException, std::exception) + sal_Bool SAL_CALL SpriteCanvas::showBuffer( sal_Bool bUpdateAll ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -98,7 +98,7 @@ namespace oglcanvas return mbIsVisible && SpriteCanvasBaseT::showBuffer( bUpdateAll ); } - sal_Bool SAL_CALL SpriteCanvas::switchBuffer( sal_Bool bUpdateAll ) throw (uno::RuntimeException, std::exception) + sal_Bool SAL_CALL SpriteCanvas::switchBuffer( sal_Bool bUpdateAll ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -109,44 +109,38 @@ namespace oglcanvas } uno::Reference< rendering::XAnimatedSprite > SAL_CALL SpriteCanvas::createSpriteFromAnimation( - const uno::Reference< rendering::XAnimation >& /*animation*/ ) throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) + const uno::Reference< rendering::XAnimation >& /*animation*/ ) { return uno::Reference< rendering::XAnimatedSprite >(); } uno::Reference< rendering::XAnimatedSprite > SAL_CALL SpriteCanvas::createSpriteFromBitmaps( const uno::Sequence< uno::Reference< rendering::XBitmap > >& /*animationBitmaps*/, - ::sal_Int8 /*interpolationMode*/ ) throw (lang::IllegalArgumentException, - rendering::VolatileContentDestroyedException, - uno::RuntimeException, std::exception) + ::sal_Int8 /*interpolationMode*/ ) { return uno::Reference< rendering::XAnimatedSprite >(); } uno::Reference< rendering::XCustomSprite > SAL_CALL SpriteCanvas::createCustomSprite( - const geometry::RealSize2D& spriteSize ) throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) + const geometry::RealSize2D& spriteSize ) { return uno::Reference< rendering::XCustomSprite >( new CanvasCustomSprite(spriteSize, this, maDeviceHelper) ); } uno::Reference< rendering::XSprite > SAL_CALL SpriteCanvas::createClonedSprite( - const uno::Reference< rendering::XSprite >& /*original*/ ) throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) + const uno::Reference< rendering::XSprite >& /*original*/ ) { return uno::Reference< rendering::XSprite >(); } sal_Bool SAL_CALL SpriteCanvas::updateScreen(sal_Bool bUpdateAll) - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return maDeviceHelper.showBuffer(mbIsVisible, bUpdateAll); } - ::rtl::OUString SAL_CALL SpriteCanvas::getServiceName( ) throw (uno::RuntimeException, std::exception) + ::rtl::OUString SAL_CALL SpriteCanvas::getServiceName( ) { return ::rtl::OUString( SPRITECANVAS_SERVICE_NAME ); } diff --git a/canvas/source/opengl/ogl_spritecanvas.hxx b/canvas/source/opengl/ogl_spritecanvas.hxx index 47e58254100c..202370bfd844 100644 --- a/canvas/source/opengl/ogl_spritecanvas.hxx +++ b/canvas/source/opengl/ogl_spritecanvas.hxx @@ -85,20 +85,18 @@ namespace oglcanvas DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( SpriteCanvas, WindowGraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase ) // XBufferController (partial) - virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL switchBuffer( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) override; + virtual sal_Bool SAL_CALL switchBuffer( sal_Bool bUpdateAll ) override; // XSpriteCanvas - virtual css::uno::Reference< css::rendering::XAnimatedSprite > SAL_CALL createSpriteFromAnimation( const css::uno::Reference< css::rendering::XAnimation >& animation ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::rendering::XAnimatedSprite > SAL_CALL createSpriteFromBitmaps( const css::uno::Sequence< css::uno::Reference< css::rendering::XBitmap > >& animationBitmaps, ::sal_Int8 interpolationMode ) throw (css::lang::IllegalArgumentException, css::rendering::VolatileContentDestroyedException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::rendering::XCustomSprite > SAL_CALL createCustomSprite( const css::geometry::RealSize2D& spriteSize ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::rendering::XSprite > SAL_CALL createClonedSprite( const css::uno::Reference< css::rendering::XSprite >& original ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) - throw (css::uno::RuntimeException, - std::exception) override; + virtual css::uno::Reference< css::rendering::XAnimatedSprite > SAL_CALL createSpriteFromAnimation( const css::uno::Reference< css::rendering::XAnimation >& animation ) override; + virtual css::uno::Reference< css::rendering::XAnimatedSprite > SAL_CALL createSpriteFromBitmaps( const css::uno::Sequence< css::uno::Reference< css::rendering::XBitmap > >& animationBitmaps, ::sal_Int8 interpolationMode ) override; + virtual css::uno::Reference< css::rendering::XCustomSprite > SAL_CALL createCustomSprite( const css::geometry::RealSize2D& spriteSize ) override; + virtual css::uno::Reference< css::rendering::XSprite > SAL_CALL createClonedSprite( const css::uno::Reference< css::rendering::XSprite >& original ) override; + virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) override; // XServiceName - virtual ::rtl::OUString SAL_CALL getServiceName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::rtl::OUString SAL_CALL getServiceName( ) override; void show( const ::rtl::Reference< CanvasCustomSprite >& ); void hide( const ::rtl::Reference< CanvasCustomSprite >& ); diff --git a/canvas/source/opengl/ogl_textlayout.cxx b/canvas/source/opengl/ogl_textlayout.cxx index c11815033586..0331c8c9d2ba 100644 --- a/canvas/source/opengl/ogl_textlayout.cxx +++ b/canvas/source/opengl/ogl_textlayout.cxx @@ -37,32 +37,32 @@ namespace oglcanvas } // XTextLayout - uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > > SAL_CALL TextLayout::queryTextShapes( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > > SAL_CALL TextLayout::queryTextShapes( ) { // TODO return uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > >(); } - uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryInkMeasures( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryInkMeasures( ) { // TODO return uno::Sequence< geometry::RealRectangle2D >(); } - uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryMeasures( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryMeasures( ) { // TODO return uno::Sequence< geometry::RealRectangle2D >(); } - uno::Sequence< double > SAL_CALL TextLayout::queryLogicalAdvancements( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< double > SAL_CALL TextLayout::queryLogicalAdvancements( ) { ::osl::MutexGuard aGuard( m_aMutex ); return maLogicalAdvancements; } - void SAL_CALL TextLayout::applyLogicalAdvancements( const uno::Sequence< double >& aAdvancements ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) + void SAL_CALL TextLayout::applyLogicalAdvancements( const uno::Sequence< double >& aAdvancements ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -75,7 +75,7 @@ namespace oglcanvas maLogicalAdvancements = aAdvancements; } - geometry::RealRectangle2D SAL_CALL TextLayout::queryTextBounds( ) throw (uno::RuntimeException, std::exception) + geometry::RealRectangle2D SAL_CALL TextLayout::queryTextBounds( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -101,27 +101,27 @@ namespace oglcanvas } } - double SAL_CALL TextLayout::justify( double /*nSize*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) + double SAL_CALL TextLayout::justify( double /*nSize*/ ) { // TODO return 0.0; } double SAL_CALL TextLayout::combinedJustify( const uno::Sequence< uno::Reference< rendering::XTextLayout > >& /*aNextLayouts*/, - double /*nSize*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) + double /*nSize*/ ) { // TODO return 0.0; } - rendering::TextHit SAL_CALL TextLayout::getTextHit( const geometry::RealPoint2D& /*aHitPoint*/ ) throw (uno::RuntimeException, std::exception) + rendering::TextHit SAL_CALL TextLayout::getTextHit( const geometry::RealPoint2D& /*aHitPoint*/ ) { // TODO return rendering::TextHit(); } rendering::Caret SAL_CALL TextLayout::getCaret( sal_Int32 /*nInsertionIndex*/, - sal_Bool /*bExcludeLigatures*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + sal_Bool /*bExcludeLigatures*/ ) { // TODO return rendering::Caret(); @@ -129,47 +129,47 @@ namespace oglcanvas sal_Int32 SAL_CALL TextLayout::getNextInsertionIndex( sal_Int32 /*nStartIndex*/, sal_Int32 /*nCaretAdvancement*/, - sal_Bool /*bExcludeLigatures*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + sal_Bool /*bExcludeLigatures*/ ) { // TODO return 0; } uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryVisualHighlighting( sal_Int32 /*nStartIndex*/, - sal_Int32 /*nEndIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + sal_Int32 /*nEndIndex*/ ) { // TODO return uno::Reference< rendering::XPolyPolygon2D >(); } uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryLogicalHighlighting( sal_Int32 /*nStartIndex*/, - sal_Int32 /*nEndIndex*/ ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + sal_Int32 /*nEndIndex*/ ) { // TODO return uno::Reference< rendering::XPolyPolygon2D >(); } - double SAL_CALL TextLayout::getBaselineOffset( ) throw (uno::RuntimeException, std::exception) + double SAL_CALL TextLayout::getBaselineOffset( ) { // TODO return 0.0; } - sal_Int8 SAL_CALL TextLayout::getMainTextDirection( ) throw (uno::RuntimeException, std::exception) + sal_Int8 SAL_CALL TextLayout::getMainTextDirection( ) { ::osl::MutexGuard aGuard( m_aMutex ); return mnTextDirection; } - uno::Reference< rendering::XCanvasFont > SAL_CALL TextLayout::getFont( ) throw (uno::RuntimeException, std::exception) + uno::Reference< rendering::XCanvasFont > SAL_CALL TextLayout::getFont( ) { ::osl::MutexGuard aGuard( m_aMutex ); return mpFont.get(); } - rendering::StringContext SAL_CALL TextLayout::getText( ) throw (uno::RuntimeException, std::exception) + rendering::StringContext SAL_CALL TextLayout::getText( ) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/canvas/source/opengl/ogl_textlayout.hxx b/canvas/source/opengl/ogl_textlayout.hxx index 168282adb1ff..c98cdcf5d465 100644 --- a/canvas/source/opengl/ogl_textlayout.hxx +++ b/canvas/source/opengl/ogl_textlayout.hxx @@ -43,23 +43,23 @@ namespace oglcanvas virtual void SAL_CALL disposing() override; // XTextLayout - virtual css::uno::Sequence< css::uno::Reference< css::rendering::XPolyPolygon2D > > SAL_CALL queryTextShapes( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryInkMeasures( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryMeasures( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< double > SAL_CALL queryLogicalAdvancements( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL applyLogicalAdvancements( const css::uno::Sequence< double >& aAdvancements ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::geometry::RealRectangle2D SAL_CALL queryTextBounds( ) throw (css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL justify( double nSize ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL combinedJustify( const css::uno::Sequence< css::uno::Reference< css::rendering::XTextLayout > >& aNextLayouts, double nSize ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::rendering::TextHit SAL_CALL getTextHit( const css::geometry::RealPoint2D& aHitPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::rendering::Caret SAL_CALL getCaret( sal_Int32 nInsertionIndex, sal_Bool bExcludeLigatures ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getNextInsertionIndex( sal_Int32 nStartIndex, sal_Int32 nCaretAdvancement, sal_Bool bExcludeLigatures ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryVisualHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryLogicalHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getBaselineOffset( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int8 SAL_CALL getMainTextDirection( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::rendering::XCanvasFont > SAL_CALL getFont( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::rendering::StringContext SAL_CALL getText( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::rendering::XPolyPolygon2D > > SAL_CALL queryTextShapes( ) override; + virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryInkMeasures( ) override; + virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryMeasures( ) override; + virtual css::uno::Sequence< double > SAL_CALL queryLogicalAdvancements( ) override; + virtual void SAL_CALL applyLogicalAdvancements( const css::uno::Sequence< double >& aAdvancements ) override; + virtual css::geometry::RealRectangle2D SAL_CALL queryTextBounds( ) override; + virtual double SAL_CALL justify( double nSize ) override; + virtual double SAL_CALL combinedJustify( const css::uno::Sequence< css::uno::Reference< css::rendering::XTextLayout > >& aNextLayouts, double nSize ) override; + virtual css::rendering::TextHit SAL_CALL getTextHit( const css::geometry::RealPoint2D& aHitPoint ) override; + virtual css::rendering::Caret SAL_CALL getCaret( sal_Int32 nInsertionIndex, sal_Bool bExcludeLigatures ) override; + virtual sal_Int32 SAL_CALL getNextInsertionIndex( sal_Int32 nStartIndex, sal_Int32 nCaretAdvancement, sal_Bool bExcludeLigatures ) override; + virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryVisualHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryLogicalHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual double SAL_CALL getBaselineOffset( ) override; + virtual sal_Int8 SAL_CALL getMainTextDirection( ) override; + virtual css::uno::Reference< css::rendering::XCanvasFont > SAL_CALL getFont( ) override; + virtual css::rendering::StringContext SAL_CALL getText( ) override; bool draw( const css::rendering::ViewState& rViewState, const css::rendering::RenderState& rRenderState, diff --git a/canvas/source/simplecanvas/simplecanvasimpl.cxx b/canvas/source/simplecanvas/simplecanvasimpl.cxx index 613724558734..8d632ec4886a 100644 --- a/canvas/source/simplecanvas/simplecanvasimpl.cxx +++ b/canvas/source/simplecanvas/simplecanvasimpl.cxx @@ -171,7 +171,7 @@ namespace private: // Ifc XServiceName - virtual OUString SAL_CALL getServiceName( ) throw (uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getServiceName( ) override { return OUString( SERVICE_NAME ); } @@ -180,7 +180,7 @@ namespace virtual void SAL_CALL selectFont( const OUString& sFontName, double size, sal_Bool bold, - sal_Bool italic ) throw (uno::RuntimeException, std::exception) override + sal_Bool italic ) override { ::osl::MutexGuard aGuard( m_aMutex ); @@ -192,31 +192,31 @@ namespace italic ? rendering::PanoseLetterForm::OBLIQUE_CONTACT : rendering::PanoseLetterForm::ANYTHING; } - virtual void SAL_CALL setPenColor( ::sal_Int32 nsRgbaColor ) throw (uno::RuntimeException, std::exception) override + virtual void SAL_CALL setPenColor( ::sal_Int32 nsRgbaColor ) override { ::osl::MutexGuard aGuard( m_aMutex ); *(maRenderState.m_aPenColor) = nsRgbaColor; } - virtual void SAL_CALL setFillColor( ::sal_Int32 nsRgbaColor ) throw (uno::RuntimeException, std::exception) override + virtual void SAL_CALL setFillColor( ::sal_Int32 nsRgbaColor ) override { ::osl::MutexGuard aGuard( m_aMutex ); *(maRenderState.m_aFillColor) = nsRgbaColor; } - virtual void SAL_CALL setRectClip( const geometry::RealRectangle2D& aRect ) throw (uno::RuntimeException, std::exception) override + virtual void SAL_CALL setRectClip( const geometry::RealRectangle2D& aRect ) override { ::osl::MutexGuard aGuard( m_aMutex ); *(maRenderState.m_aRectClip) = aRect; } - virtual void SAL_CALL setTransformation( const geometry::AffineMatrix2D& aTransform ) throw (uno::RuntimeException, std::exception) override + virtual void SAL_CALL setTransformation( const geometry::AffineMatrix2D& aTransform ) override { ::osl::MutexGuard aGuard( m_aMutex ); maRenderState.m_aTransformation = aTransform; } - virtual void SAL_CALL drawPixel( const geometry::RealPoint2D& aPoint ) throw (uno::RuntimeException, std::exception) override + virtual void SAL_CALL drawPixel( const geometry::RealPoint2D& aPoint ) override { ::osl::MutexGuard aGuard( m_aMutex ); mxCanvas->drawPoint(aPoint, @@ -225,7 +225,7 @@ namespace } virtual void SAL_CALL drawLine( const geometry::RealPoint2D& aStartPoint, - const geometry::RealPoint2D& aEndPoint ) throw (uno::RuntimeException, std::exception) override + const geometry::RealPoint2D& aEndPoint ) override { ::osl::MutexGuard aGuard( m_aMutex ); mxCanvas->drawLine(aStartPoint, @@ -234,7 +234,7 @@ namespace createStrokingRenderState()); } - virtual void SAL_CALL drawRect( const geometry::RealRectangle2D& aRect ) throw (uno::RuntimeException, std::exception) override + virtual void SAL_CALL drawRect( const geometry::RealRectangle2D& aRect ) override { ::osl::MutexGuard aGuard( m_aMutex ); uno::Reference< rendering::XPolyPolygon2D > xPoly( @@ -251,8 +251,7 @@ namespace createStrokingRenderState()); } - virtual void SAL_CALL drawPolyPolygon( const uno::Reference< rendering::XPolyPolygon2D >& xPolyPolygon ) - throw (uno::RuntimeException, std::exception) override + virtual void SAL_CALL drawPolyPolygon( const uno::Reference< rendering::XPolyPolygon2D >& xPolyPolygon ) override { ::osl::MutexGuard aGuard( m_aMutex ); @@ -268,7 +267,7 @@ namespace virtual void SAL_CALL drawText( const rendering::StringContext& aText, const geometry::RealPoint2D& aOutPos, - ::sal_Int8 nTextDirection ) throw (uno::RuntimeException, std::exception) override + ::sal_Int8 nTextDirection ) override { ::osl::MutexGuard aGuard( m_aMutex ); const basegfx::B2DHomMatrix offsetTransform(basegfx::tools::createTranslateB2DHomMatrix(aOutPos.X,aOutPos.Y)); @@ -283,8 +282,7 @@ namespace } virtual void SAL_CALL drawBitmap( const uno::Reference< rendering::XBitmap >& xBitmap, - const geometry::RealPoint2D& aLeftTop ) - throw (uno::RuntimeException, std::exception) override + const geometry::RealPoint2D& aLeftTop ) override { ::osl::MutexGuard aGuard( m_aMutex ); const basegfx::B2DHomMatrix offsetTransform(basegfx::tools::createTranslateB2DHomMatrix(aLeftTop.X,aLeftTop.Y)); @@ -294,61 +292,61 @@ namespace mxCanvas->drawBitmap(xBitmap,maViewState,aRenderState); } - virtual uno::Reference< rendering::XGraphicDevice > SAL_CALL getDevice( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Reference< rendering::XGraphicDevice > SAL_CALL getDevice( ) override { ::osl::MutexGuard aGuard( m_aMutex ); return mxCanvas->getDevice(); } - virtual uno::Reference< rendering::XCanvas > SAL_CALL getCanvas( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Reference< rendering::XCanvas > SAL_CALL getCanvas( ) override { ::osl::MutexGuard aGuard( m_aMutex ); return mxCanvas; } - virtual rendering::FontMetrics SAL_CALL getFontMetrics( ) throw (uno::RuntimeException, std::exception) override + virtual rendering::FontMetrics SAL_CALL getFontMetrics( ) override { ::osl::MutexGuard aGuard( m_aMutex ); return maFont.getOutValue()->getFontMetrics(); } - virtual uno::Reference< rendering::XCanvasFont > SAL_CALL getCurrentFont( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Reference< rendering::XCanvasFont > SAL_CALL getCurrentFont( ) override { ::osl::MutexGuard aGuard( m_aMutex ); return maFont.getOutValue(); } - virtual ::sal_Int32 SAL_CALL getCurrentPenColor( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int32 SAL_CALL getCurrentPenColor( ) override { ::osl::MutexGuard aGuard( m_aMutex ); return maRenderState.m_aPenColor.getInValue(); } - virtual ::sal_Int32 SAL_CALL getCurrentFillColor( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int32 SAL_CALL getCurrentFillColor( ) override { ::osl::MutexGuard aGuard( m_aMutex ); return maRenderState.m_aFillColor.getInValue(); } - virtual geometry::RealRectangle2D SAL_CALL getCurrentClipRect( ) throw (uno::RuntimeException, std::exception) override + virtual geometry::RealRectangle2D SAL_CALL getCurrentClipRect( ) override { ::osl::MutexGuard aGuard( m_aMutex ); return maRenderState.m_aRectClip.getInValue(); } - virtual geometry::AffineMatrix2D SAL_CALL getCurrentTransformation( ) throw (uno::RuntimeException, std::exception) override + virtual geometry::AffineMatrix2D SAL_CALL getCurrentTransformation( ) override { ::osl::MutexGuard aGuard( m_aMutex ); return maRenderState.m_aTransformation; } - virtual rendering::ViewState SAL_CALL getCurrentViewState( ) throw (uno::RuntimeException, std::exception) override + virtual rendering::ViewState SAL_CALL getCurrentViewState( ) override { ::osl::MutexGuard aGuard( m_aMutex ); return maViewState; } - virtual rendering::RenderState SAL_CALL getCurrentRenderState( sal_Bool bUseFillColor ) throw (uno::RuntimeException, std::exception) override + virtual rendering::RenderState SAL_CALL getCurrentRenderState( sal_Bool bUseFillColor ) override { ::osl::MutexGuard aGuard( m_aMutex ); if( bUseFillColor ) diff --git a/canvas/source/tools/cachedprimitivebase.cxx b/canvas/source/tools/cachedprimitivebase.cxx index e185bf969a0e..d84e96495828 100644 --- a/canvas/source/tools/cachedprimitivebase.cxx +++ b/canvas/source/tools/cachedprimitivebase.cxx @@ -51,7 +51,7 @@ namespace canvas mxTarget.clear(); } - sal_Int8 SAL_CALL CachedPrimitiveBase::redraw( const rendering::ViewState& aState ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) + sal_Int8 SAL_CALL CachedPrimitiveBase::redraw( const rendering::ViewState& aState ) { ::basegfx::B2DHomMatrix aUsedTransformation; ::basegfx::B2DHomMatrix aNewTransformation; @@ -76,17 +76,17 @@ namespace canvas bSameViewTransforms ); } - OUString SAL_CALL CachedPrimitiveBase::getImplementationName( ) throw (uno::RuntimeException, std::exception) + OUString SAL_CALL CachedPrimitiveBase::getImplementationName( ) { return OUString("canvas::CachedPrimitiveBase"); } - sal_Bool SAL_CALL CachedPrimitiveBase::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException, std::exception) + sal_Bool SAL_CALL CachedPrimitiveBase::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } - uno::Sequence< OUString > SAL_CALL CachedPrimitiveBase::getSupportedServiceNames( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< OUString > SAL_CALL CachedPrimitiveBase::getSupportedServiceNames( ) { return { "com.sun.star.rendering.CachedBitmap" }; } diff --git a/canvas/source/tools/canvastools.cxx b/canvas/source/tools/canvastools.cxx index fdf8ab7729a9..7ab36a8ed2e4 100644 --- a/canvas/source/tools/canvastools.cxx +++ b/canvas/source/tools/canvastools.cxx @@ -184,25 +184,24 @@ namespace canvas uno::Sequence< sal_Int8 > maComponentTags; uno::Sequence< sal_Int32 > maBitCounts; - virtual ::sal_Int8 SAL_CALL getType( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int8 SAL_CALL getType( ) override { return rendering::ColorSpaceType::RGB; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags( ) override { return maComponentTags; } - virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) override { return rendering::RenderingIntent::PERCEPTUAL; } - virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties( ) override { return uno::Sequence< beans::PropertyValue >(); } virtual uno::Sequence< double > SAL_CALL convertColorSpace( const uno::Sequence< double >& deviceColor, - const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) override + const uno::Reference< rendering::XColorSpace >& targetColorSpace ) override { // TODO(P3): if we know anything about target // colorspace, this can be greatly sped up @@ -210,7 +209,7 @@ namespace canvas convertToARGB(deviceColor)); return targetColorSpace->convertFromARGB(aIntermediate); } - virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) override { const double* pIn( deviceColor.getConstArray() ); const std::size_t nLen( deviceColor.getLength() ); @@ -227,7 +226,7 @@ namespace canvas } return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) override { SAL_WARN_IF(deviceColor.getLength() == 0, "canvas", "empty deviceColor argument"); const double* pIn( deviceColor.getConstArray() ); @@ -245,7 +244,7 @@ namespace canvas } return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) override { const double* pIn( deviceColor.getConstArray() ); const std::size_t nLen( deviceColor.getLength() ); @@ -262,7 +261,7 @@ namespace canvas } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) override { const rendering::RGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); @@ -279,7 +278,7 @@ namespace canvas } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); @@ -296,7 +295,7 @@ namespace canvas } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); @@ -315,21 +314,20 @@ namespace canvas } // XIntegerBitmapColorSpace - virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) override { return 32; } - virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) override { return maBitCounts; } - virtual ::sal_Int8 SAL_CALL getEndianness( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int8 SAL_CALL getEndianness( ) override { return util::Endianness::LITTLE; } virtual uno::Sequence SAL_CALL convertFromIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor, - const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) override + const uno::Reference< rendering::XColorSpace >& targetColorSpace ) override { if( dynamic_cast(targetColorSpace.get()) ) { @@ -360,8 +358,7 @@ namespace canvas } } virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertToIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor, - const uno::Reference< rendering::XIntegerBitmapColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) override + const uno::Reference< rendering::XIntegerBitmapColorSpace >& targetColorSpace ) override { if( dynamic_cast(targetColorSpace.get()) ) { @@ -377,7 +374,7 @@ namespace canvas return targetColorSpace->convertIntegerFromARGB(aIntermediate); } } - virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) override { const sal_Int8* pIn( deviceColor.getConstArray() ); const std::size_t nLen( deviceColor.getLength() ); @@ -398,7 +395,7 @@ namespace canvas return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) override { const sal_Int8* pIn( deviceColor.getConstArray() ); const std::size_t nLen( deviceColor.getLength() ); @@ -420,7 +417,7 @@ namespace canvas return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) override { const sal_Int8* pIn( deviceColor.getConstArray() ); const std::size_t nLen( deviceColor.getLength() ); @@ -443,7 +440,7 @@ namespace canvas return aRes; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) override { const rendering::RGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); @@ -461,7 +458,7 @@ namespace canvas return aRes; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); @@ -479,7 +476,7 @@ namespace canvas return aRes; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); @@ -522,25 +519,24 @@ namespace canvas uno::Sequence< sal_Int8 > maComponentTags; uno::Sequence< sal_Int32 > maBitCounts; - virtual ::sal_Int8 SAL_CALL getType( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int8 SAL_CALL getType( ) override { return rendering::ColorSpaceType::RGB; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int8 > SAL_CALL getComponentTags( ) override { return maComponentTags; } - virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int8 SAL_CALL getRenderingIntent( ) override { return rendering::RenderingIntent::PERCEPTUAL; } - virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< beans::PropertyValue > SAL_CALL getProperties( ) override { return uno::Sequence< beans::PropertyValue >(); } virtual uno::Sequence< double > SAL_CALL convertColorSpace( const uno::Sequence< double >& deviceColor, - const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) override + const uno::Reference< rendering::XColorSpace >& targetColorSpace ) override { // TODO(P3): if we know anything about target // colorspace, this can be greatly sped up @@ -548,7 +544,7 @@ namespace canvas convertToARGB(deviceColor)); return targetColorSpace->convertFromARGB(aIntermediate); } - virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertToRGB( const uno::Sequence< double >& deviceColor ) override { const double* pIn( deviceColor.getConstArray() ); const std::size_t nLen( deviceColor.getLength() ); @@ -565,7 +561,7 @@ namespace canvas } return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToARGB( const uno::Sequence< double >& deviceColor ) override { const double* pIn( deviceColor.getConstArray() ); const std::size_t nLen( deviceColor.getLength() ); @@ -582,7 +578,7 @@ namespace canvas } return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertToPARGB( const uno::Sequence< double >& deviceColor ) override { const double* pIn( deviceColor.getConstArray() ); const std::size_t nLen( deviceColor.getLength() ); @@ -599,7 +595,7 @@ namespace canvas } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< double > SAL_CALL convertFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) override { const rendering::RGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); @@ -616,7 +612,7 @@ namespace canvas } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< double > SAL_CALL convertFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); @@ -633,7 +629,7 @@ namespace canvas } return aRes; } - virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< double > SAL_CALL convertFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); @@ -652,21 +648,20 @@ namespace canvas } // XIntegerBitmapColorSpace - virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int32 SAL_CALL getBitsPerPixel( ) override { return 32; } - virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) throw (uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int32 > SAL_CALL getComponentBitCounts( ) override { return maBitCounts; } - virtual ::sal_Int8 SAL_CALL getEndianness( ) throw (uno::RuntimeException, std::exception) override + virtual ::sal_Int8 SAL_CALL getEndianness( ) override { return util::Endianness::LITTLE; } virtual uno::Sequence SAL_CALL convertFromIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor, - const uno::Reference< rendering::XColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) override + const uno::Reference< rendering::XColorSpace >& targetColorSpace ) override { if( dynamic_cast(targetColorSpace.get()) ) { @@ -697,8 +692,7 @@ namespace canvas } } virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertToIntegerColorSpace( const uno::Sequence< ::sal_Int8 >& deviceColor, - const uno::Reference< rendering::XIntegerBitmapColorSpace >& targetColorSpace ) throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) override + const uno::Reference< rendering::XIntegerBitmapColorSpace >& targetColorSpace ) override { if( dynamic_cast(targetColorSpace.get()) ) { @@ -714,7 +708,7 @@ namespace canvas return targetColorSpace->convertIntegerFromARGB(aIntermediate); } } - virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::RGBColor > SAL_CALL convertIntegerToRGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) override { const sal_Int8* pIn( deviceColor.getConstArray() ); const std::size_t nLen( deviceColor.getLength() ); @@ -735,7 +729,7 @@ namespace canvas return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) override { const sal_Int8* pIn( deviceColor.getConstArray() ); const std::size_t nLen( deviceColor.getLength() ); @@ -757,7 +751,7 @@ namespace canvas return aRes; } - virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< rendering::ARGBColor > SAL_CALL convertIntegerToPARGB( const uno::Sequence< ::sal_Int8 >& deviceColor ) override { const sal_Int8* pIn( deviceColor.getConstArray() ); const std::size_t nLen( deviceColor.getLength() ); @@ -779,7 +773,7 @@ namespace canvas return aRes; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromRGB( const uno::Sequence< rendering::RGBColor >& rgbColor ) override { const rendering::RGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); @@ -797,7 +791,7 @@ namespace canvas return aRes; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); @@ -815,7 +809,7 @@ namespace canvas return aRes; } - virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) override + virtual uno::Sequence< ::sal_Int8 > SAL_CALL convertIntegerFromPARGB( const uno::Sequence< rendering::ARGBColor >& rgbColor ) override { const rendering::ARGBColor* pIn( rgbColor.getConstArray() ); const std::size_t nLen( rgbColor.getLength() ); diff --git a/canvas/source/tools/parametricpolypolygon.cxx b/canvas/source/tools/parametricpolypolygon.cxx index 05697d8e2a8d..d5bed4381921 100644 --- a/canvas/source/tools/parametricpolypolygon.cxx +++ b/canvas/source/tools/parametricpolypolygon.cxx @@ -164,25 +164,25 @@ namespace canvas mxDevice.clear(); } - uno::Reference< rendering::XPolyPolygon2D > SAL_CALL ParametricPolyPolygon::getOutline( double /*t*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) + uno::Reference< rendering::XPolyPolygon2D > SAL_CALL ParametricPolyPolygon::getOutline( double /*t*/ ) { // TODO(F1): outline NYI return uno::Reference< rendering::XPolyPolygon2D >(); } - uno::Sequence< double > SAL_CALL ParametricPolyPolygon::getColor( double /*t*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) + uno::Sequence< double > SAL_CALL ParametricPolyPolygon::getColor( double /*t*/ ) { // TODO(F1): color NYI return uno::Sequence< double >(); } - uno::Sequence< double > SAL_CALL ParametricPolyPolygon::getPointColor( const geometry::RealPoint2D& /*point*/ ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) + uno::Sequence< double > SAL_CALL ParametricPolyPolygon::getPointColor( const geometry::RealPoint2D& /*point*/ ) { // TODO(F1): point color NYI return uno::Sequence< double >(); } - uno::Reference< rendering::XColorSpace > SAL_CALL ParametricPolyPolygon::getColorSpace() throw (uno::RuntimeException, std::exception) + uno::Reference< rendering::XColorSpace > SAL_CALL ParametricPolyPolygon::getColorSpace() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -190,17 +190,17 @@ namespace canvas } - OUString SAL_CALL ParametricPolyPolygon::getImplementationName( ) throw (uno::RuntimeException, std::exception) + OUString SAL_CALL ParametricPolyPolygon::getImplementationName( ) { return OUString( "Canvas::ParametricPolyPolygon" ); } - sal_Bool SAL_CALL ParametricPolyPolygon::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException, std::exception) + sal_Bool SAL_CALL ParametricPolyPolygon::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } - uno::Sequence< OUString > SAL_CALL ParametricPolyPolygon::getSupportedServiceNames( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< OUString > SAL_CALL ParametricPolyPolygon::getSupportedServiceNames( ) { return { "com.sun.star.rendering.ParametricPolyPolygon" }; } diff --git a/canvas/source/vcl/canvas.cxx b/canvas/source/vcl/canvas.cxx index bd3f89d7e21b..cb65127e4d37 100644 --- a/canvas/source/vcl/canvas.cxx +++ b/canvas/source/vcl/canvas.cxx @@ -129,7 +129,7 @@ namespace vclcanvas CanvasBaseT::disposeThis(); } - OUString SAL_CALL Canvas::getServiceName( ) throw (css::uno::RuntimeException, std::exception) + OUString SAL_CALL Canvas::getServiceName( ) { return OUString( CANVAS_SERVICE_NAME ); } diff --git a/canvas/source/vcl/canvas.hxx b/canvas/source/vcl/canvas.hxx index d4ae09097002..225ca2a7f1f4 100644 --- a/canvas/source/vcl/canvas.hxx +++ b/canvas/source/vcl/canvas.hxx @@ -100,7 +100,7 @@ namespace vclcanvas DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( Canvas, GraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase ) // XServiceName - virtual OUString SAL_CALL getServiceName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName( ) override; // RepaintTarget virtual bool repaint( const GraphicObjectSharedPtr& rGrf, diff --git a/canvas/source/vcl/canvasbitmap.cxx b/canvas/source/vcl/canvasbitmap.cxx index 84b3adc7ef0b..9126fc5c0666 100644 --- a/canvas/source/vcl/canvasbitmap.cxx +++ b/canvas/source/vcl/canvasbitmap.cxx @@ -74,17 +74,17 @@ namespace vclcanvas } - OUString SAL_CALL CanvasBitmap::getImplementationName( ) throw (uno::RuntimeException, std::exception) + OUString SAL_CALL CanvasBitmap::getImplementationName( ) { return OUString( "VCLCanvas.CanvasBitmap" ); } - sal_Bool SAL_CALL CanvasBitmap::supportsService( const OUString& ServiceName ) throw (uno::RuntimeException, std::exception) + sal_Bool SAL_CALL CanvasBitmap::supportsService( const OUString& ServiceName ) { return cppu::supportsService( this, ServiceName ); } - uno::Sequence< OUString > SAL_CALL CanvasBitmap::getSupportedServiceNames( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< OUString > SAL_CALL CanvasBitmap::getSupportedServiceNames( ) { return { "com.sun.star.rendering.CanvasBitmap" }; } @@ -112,7 +112,7 @@ namespace vclcanvas return maCanvasHelper.repaint( rGrf, viewState, renderState, rPt, rSz, rAttr ); } - uno::Any SAL_CALL CanvasBitmap::getFastPropertyValue( sal_Int32 nHandle ) throw (uno::RuntimeException, std::exception) + uno::Any SAL_CALL CanvasBitmap::getFastPropertyValue( sal_Int32 nHandle ) { if( nHandle == 0 ) { BitmapEx* pBitmapEx = new BitmapEx( getBitmap() ); diff --git a/canvas/source/vcl/canvasbitmap.hxx b/canvas/source/vcl/canvasbitmap.hxx index 543d80e3fa1b..ca0cbaaa9bab 100644 --- a/canvas/source/vcl/canvasbitmap.hxx +++ b/canvas/source/vcl/canvasbitmap.hxx @@ -82,9 +82,9 @@ namespace vclcanvas const OutDevProviderSharedPtr& rOutDevProvider ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // RepaintTarget interface virtual bool repaint( const GraphicObjectSharedPtr& rGrf, @@ -107,8 +107,8 @@ namespace vclcanvas // 1st a bool value: true - free the pixmap after used by XFreePixmap, false do nothing, the pixmap is used internally in the canvas // 2nd the pixmap handle // 3rd the pixmap depth - virtual css::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFastPropertyValue(sal_Int32, const css::uno::Any&) throw (css::uno::RuntimeException, std::exception) override {} + virtual css::uno::Any SAL_CALL getFastPropertyValue(sal_Int32 nHandle) override; + virtual void SAL_CALL setFastPropertyValue(sal_Int32, const css::uno::Any&) override {} private: /** MUST hold here, too, since CanvasHelper only contains a diff --git a/canvas/source/vcl/canvascustomsprite.cxx b/canvas/source/vcl/canvascustomsprite.cxx index acff95a08810..e8ee7752cc0d 100644 --- a/canvas/source/vcl/canvascustomsprite.cxx +++ b/canvas/source/vcl/canvascustomsprite.cxx @@ -115,17 +115,17 @@ namespace vclcanvas maCanvasHelper.clear(); } - OUString SAL_CALL CanvasCustomSprite::getImplementationName() throw( uno::RuntimeException, std::exception ) + OUString SAL_CALL CanvasCustomSprite::getImplementationName() { return OUString( "VCLCanvas.CanvasCustomSprite" ); } - sal_Bool SAL_CALL CanvasCustomSprite::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception ) + sal_Bool SAL_CALL CanvasCustomSprite::supportsService( const OUString& ServiceName ) { return cppu::supportsService( this, ServiceName ); } - uno::Sequence< OUString > SAL_CALL CanvasCustomSprite::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) + uno::Sequence< OUString > SAL_CALL CanvasCustomSprite::getSupportedServiceNames() { return { "com.sun.star.rendering.CanvasCustomSprite" }; } diff --git a/canvas/source/vcl/canvascustomsprite.hxx b/canvas/source/vcl/canvascustomsprite.hxx index 43283e2f8629..4075200328bf 100644 --- a/canvas/source/vcl/canvascustomsprite.hxx +++ b/canvas/source/vcl/canvascustomsprite.hxx @@ -99,9 +99,9 @@ namespace vclcanvas DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( CanvasCustomSprite, CanvasCustomSpriteBase_Base, ::cppu::WeakComponentImplHelperBase ) // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // Sprite virtual void redraw( OutputDevice& rOutDev, diff --git a/canvas/source/vcl/canvasfont.cxx b/canvas/source/vcl/canvasfont.cxx index da901cce4d97..94798710f829 100644 --- a/canvas/source/vcl/canvasfont.cxx +++ b/canvas/source/vcl/canvasfont.cxx @@ -92,7 +92,7 @@ namespace vclcanvas mpRefDevice.clear(); } - uno::Reference< rendering::XTextLayout > SAL_CALL CanvasFont::createTextLayout( const rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) throw (uno::RuntimeException, std::exception) + uno::Reference< rendering::XTextLayout > SAL_CALL CanvasFont::createTextLayout( const rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) { SolarMutexGuard aGuard; @@ -107,14 +107,14 @@ namespace vclcanvas mpOutDevProvider); } - rendering::FontRequest SAL_CALL CanvasFont::getFontRequest( ) throw (uno::RuntimeException, std::exception) + rendering::FontRequest SAL_CALL CanvasFont::getFontRequest( ) { SolarMutexGuard aGuard; return maFontRequest; } - rendering::FontMetrics SAL_CALL CanvasFont::getFontMetrics( ) throw (uno::RuntimeException, std::exception) + rendering::FontMetrics SAL_CALL CanvasFont::getFontMetrics( ) { SolarMutexGuard aGuard; @@ -133,29 +133,29 @@ namespace vclcanvas aMetric.GetAscent() / 2.0); } - uno::Sequence< double > SAL_CALL CanvasFont::getAvailableSizes( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< double > SAL_CALL CanvasFont::getAvailableSizes( ) { // TODO(F1) return uno::Sequence< double >(); } - uno::Sequence< beans::PropertyValue > SAL_CALL CanvasFont::getExtraFontProperties( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< beans::PropertyValue > SAL_CALL CanvasFont::getExtraFontProperties( ) { // TODO(F1) return uno::Sequence< beans::PropertyValue >(); } - OUString SAL_CALL CanvasFont::getImplementationName() throw( uno::RuntimeException, std::exception ) + OUString SAL_CALL CanvasFont::getImplementationName() { return OUString( "VCLCanvas::CanvasFont" ); } - sal_Bool SAL_CALL CanvasFont::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception ) + sal_Bool SAL_CALL CanvasFont::supportsService( const OUString& ServiceName ) { return cppu::supportsService( this, ServiceName ); } - uno::Sequence< OUString > SAL_CALL CanvasFont::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) + uno::Sequence< OUString > SAL_CALL CanvasFont::getSupportedServiceNames() { return { "com.sun.star.rendering.CanvasFont" }; } diff --git a/canvas/source/vcl/canvasfont.hxx b/canvas/source/vcl/canvasfont.hxx index b17126222b7d..83c37deeed34 100644 --- a/canvas/source/vcl/canvasfont.hxx +++ b/canvas/source/vcl/canvasfont.hxx @@ -64,16 +64,16 @@ namespace vclcanvas virtual void SAL_CALL disposing() override; // XCanvasFont - virtual css::uno::Reference< css::rendering::XTextLayout > SAL_CALL createTextLayout( const css::rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::rendering::FontRequest SAL_CALL getFontRequest( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::rendering::FontMetrics SAL_CALL getFontMetrics( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< double > SAL_CALL getAvailableSizes( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getExtraFontProperties( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::rendering::XTextLayout > SAL_CALL createTextLayout( const css::rendering::StringContext& aText, sal_Int8 nDirection, sal_Int64 nRandomSeed ) override; + virtual css::rendering::FontRequest SAL_CALL getFontRequest( ) override; + virtual css::rendering::FontMetrics SAL_CALL getFontMetrics( ) override; + virtual css::uno::Sequence< double > SAL_CALL getAvailableSizes( ) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getExtraFontProperties( ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; vcl::Font getVCLFont() const; diff --git a/canvas/source/vcl/spritecanvas.cxx b/canvas/source/vcl/spritecanvas.cxx index 268ff3766981..11a6ca5e27c1 100644 --- a/canvas/source/vcl/spritecanvas.cxx +++ b/canvas/source/vcl/spritecanvas.cxx @@ -119,17 +119,17 @@ namespace vclcanvas SpriteCanvasBaseT::disposeThis(); } - sal_Bool SAL_CALL SpriteCanvas::showBuffer( sal_Bool bUpdateAll ) throw (uno::RuntimeException, std::exception) + sal_Bool SAL_CALL SpriteCanvas::showBuffer( sal_Bool bUpdateAll ) { return updateScreen( bUpdateAll ); } - sal_Bool SAL_CALL SpriteCanvas::switchBuffer( sal_Bool bUpdateAll ) throw (uno::RuntimeException) + sal_Bool SAL_CALL SpriteCanvas::switchBuffer( sal_Bool bUpdateAll ) { return updateScreen( bUpdateAll ); } - sal_Bool SAL_CALL SpriteCanvas::updateScreen( sal_Bool bUpdateAll ) throw (uno::RuntimeException, std::exception) + sal_Bool SAL_CALL SpriteCanvas::updateScreen( sal_Bool bUpdateAll ) { SolarMutexGuard aGuard; @@ -140,7 +140,7 @@ namespace vclcanvas mbSurfaceDirty); } - OUString SAL_CALL SpriteCanvas::getServiceName( ) throw (css::uno::RuntimeException, std::exception) + OUString SAL_CALL SpriteCanvas::getServiceName( ) { return OUString( SPRITECANVAS_SERVICE_NAME ); } diff --git a/canvas/source/vcl/spritecanvas.hxx b/canvas/source/vcl/spritecanvas.hxx index f339eead496e..b6f2bd5c6db8 100644 --- a/canvas/source/vcl/spritecanvas.hxx +++ b/canvas/source/vcl/spritecanvas.hxx @@ -125,14 +125,14 @@ namespace vclcanvas DECLARE_UNO3_XCOMPONENT_AGG_DEFAULTS( SpriteCanvas, WindowGraphicDeviceBase_Base, ::cppu::WeakComponentImplHelperBase ) // XBufferController (partial) - virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL switchBuffer( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL showBuffer( sal_Bool bUpdateAll ) override; + virtual sal_Bool SAL_CALL switchBuffer( sal_Bool bUpdateAll ) override; // XSpriteCanvas (partial) - virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL updateScreen( sal_Bool bUpdateAll ) override; // XServiceName - virtual OUString SAL_CALL getServiceName( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName( ) override; // RepaintTarget virtual bool repaint( const GraphicObjectSharedPtr& rGrf, diff --git a/canvas/source/vcl/textlayout.cxx b/canvas/source/vcl/textlayout.cxx index 67520a399b15..bdab9f9a6fab 100644 --- a/canvas/source/vcl/textlayout.cxx +++ b/canvas/source/vcl/textlayout.cxx @@ -99,7 +99,7 @@ namespace vclcanvas } // XTextLayout - uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > > SAL_CALL TextLayout::queryTextShapes( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< uno::Reference< rendering::XPolyPolygon2D > > SAL_CALL TextLayout::queryTextShapes( ) { SolarMutexGuard aGuard; @@ -150,7 +150,7 @@ namespace vclcanvas return comphelper::containerToSequence(aOutlineSequence); } - uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryInkMeasures( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryInkMeasures( ) { SolarMutexGuard aGuard; @@ -202,20 +202,20 @@ namespace vclcanvas return aBoundingBoxes; } - uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryMeasures( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< geometry::RealRectangle2D > SAL_CALL TextLayout::queryMeasures( ) { // TODO(F1) return uno::Sequence< geometry::RealRectangle2D >(); } - uno::Sequence< double > SAL_CALL TextLayout::queryLogicalAdvancements( ) throw (uno::RuntimeException, std::exception) + uno::Sequence< double > SAL_CALL TextLayout::queryLogicalAdvancements( ) { SolarMutexGuard aGuard; return maLogicalAdvancements; } - void SAL_CALL TextLayout::applyLogicalAdvancements( const uno::Sequence< double >& aAdvancements ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) + void SAL_CALL TextLayout::applyLogicalAdvancements( const uno::Sequence< double >& aAdvancements ) { SolarMutexGuard aGuard; @@ -225,7 +225,7 @@ namespace vclcanvas maLogicalAdvancements = aAdvancements; } - geometry::RealRectangle2D SAL_CALL TextLayout::queryTextBounds( ) throw (uno::RuntimeException, std::exception) + geometry::RealRectangle2D SAL_CALL TextLayout::queryTextBounds( ) { SolarMutexGuard aGuard; @@ -263,7 +263,7 @@ namespace vclcanvas } } - double SAL_CALL TextLayout::justify( double nSize ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) + double SAL_CALL TextLayout::justify( double nSize ) { (void)nSize; @@ -272,7 +272,7 @@ namespace vclcanvas } double SAL_CALL TextLayout::combinedJustify( const uno::Sequence< uno::Reference< rendering::XTextLayout > >& aNextLayouts, - double nSize ) throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) + double nSize ) { (void)aNextLayouts; (void)nSize; @@ -281,7 +281,7 @@ namespace vclcanvas return 0.0; } - rendering::TextHit SAL_CALL TextLayout::getTextHit( const geometry::RealPoint2D& aHitPoint ) throw (uno::RuntimeException, std::exception) + rendering::TextHit SAL_CALL TextLayout::getTextHit( const geometry::RealPoint2D& aHitPoint ) { (void)aHitPoint; @@ -289,7 +289,7 @@ namespace vclcanvas return rendering::TextHit(); } - rendering::Caret SAL_CALL TextLayout::getCaret( sal_Int32 nInsertionIndex, sal_Bool bExcludeLigatures ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + rendering::Caret SAL_CALL TextLayout::getCaret( sal_Int32 nInsertionIndex, sal_Bool bExcludeLigatures ) { (void)nInsertionIndex; (void)bExcludeLigatures; @@ -298,7 +298,7 @@ namespace vclcanvas return rendering::Caret(); } - sal_Int32 SAL_CALL TextLayout::getNextInsertionIndex( sal_Int32 nStartIndex, sal_Int32 nCaretAdvancement, sal_Bool bExcludeLigatures ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + sal_Int32 SAL_CALL TextLayout::getNextInsertionIndex( sal_Int32 nStartIndex, sal_Int32 nCaretAdvancement, sal_Bool bExcludeLigatures ) { (void)nStartIndex; (void)nCaretAdvancement; @@ -308,7 +308,7 @@ namespace vclcanvas return 0; } - uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryVisualHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryVisualHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { (void)nStartIndex; (void)nEndIndex; @@ -317,7 +317,7 @@ namespace vclcanvas return uno::Reference< rendering::XPolyPolygon2D >(); } - uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryLogicalHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (lang::IndexOutOfBoundsException, uno::RuntimeException, std::exception) + uno::Reference< rendering::XPolyPolygon2D > SAL_CALL TextLayout::queryLogicalHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { (void)nStartIndex; (void)nEndIndex; @@ -326,27 +326,27 @@ namespace vclcanvas return uno::Reference< rendering::XPolyPolygon2D >(); } - double SAL_CALL TextLayout::getBaselineOffset( ) throw (uno::RuntimeException, std::exception) + double SAL_CALL TextLayout::getBaselineOffset( ) { // TODO(F1) return 0.0; } - sal_Int8 SAL_CALL TextLayout::getMainTextDirection( ) throw (uno::RuntimeException, std::exception) + sal_Int8 SAL_CALL TextLayout::getMainTextDirection( ) { SolarMutexGuard aGuard; return mnTextDirection; } - uno::Reference< rendering::XCanvasFont > SAL_CALL TextLayout::getFont( ) throw (uno::RuntimeException, std::exception) + uno::Reference< rendering::XCanvasFont > SAL_CALL TextLayout::getFont( ) { SolarMutexGuard aGuard; return mpFont.get(); } - rendering::StringContext SAL_CALL TextLayout::getText( ) throw (uno::RuntimeException, std::exception) + rendering::StringContext SAL_CALL TextLayout::getText( ) { SolarMutexGuard aGuard; @@ -441,17 +441,17 @@ namespace vclcanvas OffsetTransformer( aMatrix ) ); } - OUString SAL_CALL TextLayout::getImplementationName() throw( uno::RuntimeException, std::exception ) + OUString SAL_CALL TextLayout::getImplementationName() { return OUString( "VCLCanvas::TextLayout" ); } - sal_Bool SAL_CALL TextLayout::supportsService( const OUString& ServiceName ) throw( uno::RuntimeException, std::exception ) + sal_Bool SAL_CALL TextLayout::supportsService( const OUString& ServiceName ) { return cppu::supportsService( this, ServiceName ); } - uno::Sequence< OUString > SAL_CALL TextLayout::getSupportedServiceNames() throw( uno::RuntimeException, std::exception ) + uno::Sequence< OUString > SAL_CALL TextLayout::getSupportedServiceNames() { return { "com.sun.star.rendering.TextLayout" }; } diff --git a/canvas/source/vcl/textlayout.hxx b/canvas/source/vcl/textlayout.hxx index 713397045644..9994ac70ff6d 100644 --- a/canvas/source/vcl/textlayout.hxx +++ b/canvas/source/vcl/textlayout.hxx @@ -60,28 +60,28 @@ namespace vclcanvas virtual void SAL_CALL disposing() override; // XTextLayout - virtual css::uno::Sequence< css::uno::Reference< css::rendering::XPolyPolygon2D > > SAL_CALL queryTextShapes( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryInkMeasures( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryMeasures( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< double > SAL_CALL queryLogicalAdvancements( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL applyLogicalAdvancements( const css::uno::Sequence< double >& aAdvancements ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::geometry::RealRectangle2D SAL_CALL queryTextBounds( ) throw (css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL justify( double nSize ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL combinedJustify( const css::uno::Sequence< css::uno::Reference< css::rendering::XTextLayout > >& aNextLayouts, double nSize ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual css::rendering::TextHit SAL_CALL getTextHit( const css::geometry::RealPoint2D& aHitPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::rendering::Caret SAL_CALL getCaret( sal_Int32 nInsertionIndex, sal_Bool bExcludeLigatures ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getNextInsertionIndex( sal_Int32 nStartIndex, sal_Int32 nCaretAdvancement, sal_Bool bExcludeLigatures ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryVisualHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryLogicalHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (css::lang::IndexOutOfBoundsException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getBaselineOffset( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int8 SAL_CALL getMainTextDirection( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::rendering::XCanvasFont > SAL_CALL getFont( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::rendering::StringContext SAL_CALL getText( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::rendering::XPolyPolygon2D > > SAL_CALL queryTextShapes( ) override; + virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryInkMeasures( ) override; + virtual css::uno::Sequence< css::geometry::RealRectangle2D > SAL_CALL queryMeasures( ) override; + virtual css::uno::Sequence< double > SAL_CALL queryLogicalAdvancements( ) override; + virtual void SAL_CALL applyLogicalAdvancements( const css::uno::Sequence< double >& aAdvancements ) override; + virtual css::geometry::RealRectangle2D SAL_CALL queryTextBounds( ) override; + virtual double SAL_CALL justify( double nSize ) override; + virtual double SAL_CALL combinedJustify( const css::uno::Sequence< css::uno::Reference< css::rendering::XTextLayout > >& aNextLayouts, double nSize ) override; + virtual css::rendering::TextHit SAL_CALL getTextHit( const css::geometry::RealPoint2D& aHitPoint ) override; + virtual css::rendering::Caret SAL_CALL getCaret( sal_Int32 nInsertionIndex, sal_Bool bExcludeLigatures ) override; + virtual sal_Int32 SAL_CALL getNextInsertionIndex( sal_Int32 nStartIndex, sal_Int32 nCaretAdvancement, sal_Bool bExcludeLigatures ) override; + virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryVisualHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual css::uno::Reference< css::rendering::XPolyPolygon2D > SAL_CALL queryLogicalHighlighting( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) override; + virtual double SAL_CALL getBaselineOffset( ) override; + virtual sal_Int8 SAL_CALL getMainTextDirection( ) override; + virtual css::uno::Reference< css::rendering::XCanvasFont > SAL_CALL getFont( ) override; + virtual css::rendering::StringContext SAL_CALL getText( ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; bool draw( OutputDevice& rOutDev, const Point& rOutpos, diff --git a/chart2/inc/ChartModel.hxx b/chart2/inc/ChartModel.hxx index 0a0889138a40..05999229a296 100644 --- a/chart2/inc/ChartModel.hxx +++ b/chart2/inc/ChartModel.hxx @@ -180,21 +180,17 @@ private: /// @throws css::uno::RuntimeException css::uno::Reference< css::frame::XController > - impl_getCurrentController() - throw( css::uno::RuntimeException); + impl_getCurrentController(); /// @throws css::uno::RuntimeException void SAL_CALL - impl_notifyModifiedListeners() - throw( css::uno::RuntimeException); + impl_notifyModifiedListeners(); /// @throws css::uno::RuntimeException void SAL_CALL - impl_notifyCloseListeners() - throw( css::uno::RuntimeException); + impl_notifyCloseListeners(); /// @throws css::uno::RuntimeException void SAL_CALL - impl_notifyStorageChangeListeners() - throw(css::uno::RuntimeException); + impl_notifyStorageChangeListeners(); void impl_store( const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor, @@ -223,349 +219,241 @@ public: // css::lang::XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // css::lang::XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // css::frame::XModel (required interface) virtual sal_Bool SAL_CALL attachResource( const OUString& rURL, - const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) override; virtual OUString SAL_CALL - getURL() throw (css::uno::RuntimeException, std::exception) override; + getURL() override; virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL - getArgs() throw (css::uno::RuntimeException, std::exception) override; + getArgs() override; virtual void SAL_CALL - connectController( const css::uno::Reference< css::frame::XController >& xController ) - throw (css::uno::RuntimeException, std::exception) override; + connectController( const css::uno::Reference< css::frame::XController >& xController ) override; virtual void SAL_CALL - disconnectController( const css::uno::Reference< css::frame::XController >& xController ) - throw (css::uno::RuntimeException, std::exception) override; + disconnectController( const css::uno::Reference< css::frame::XController >& xController ) override; virtual void SAL_CALL - lockControllers() throw (css::uno::RuntimeException, std::exception) override; + lockControllers() override; virtual void SAL_CALL - unlockControllers() throw (css::uno::RuntimeException, std::exception) override; + unlockControllers() override; virtual sal_Bool SAL_CALL - hasControllersLocked() - throw (css::uno::RuntimeException, std::exception) override; + hasControllersLocked() override; virtual css::uno::Reference< css::frame::XController > SAL_CALL - getCurrentController() - throw (css::uno::RuntimeException, std::exception) override; + getCurrentController() override; virtual void SAL_CALL - setCurrentController( const css::uno::Reference< css::frame::XController >& xController ) - throw (css::container::NoSuchElementException - , css::uno::RuntimeException, std::exception) override; + setCurrentController( const css::uno::Reference< css::frame::XController >& xController ) override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL - getCurrentSelection() - throw (css::uno::RuntimeException, std::exception) override; + getCurrentSelection() override; // css::lang::XComponent (base of XModel) virtual void SAL_CALL - dispose() throw (css::uno::RuntimeException, std::exception) override; + dispose() override; virtual void SAL_CALL - addEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) - throw (css::uno::RuntimeException, std::exception) override; + addEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) override; virtual void SAL_CALL - removeEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) - throw (css::uno::RuntimeException, std::exception) override; + removeEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) override; // css::util::XCloseable virtual void SAL_CALL - close( sal_Bool bDeliverOwnership ) - throw(css::util::CloseVetoException, - css::uno::RuntimeException, std::exception) override; + close( sal_Bool bDeliverOwnership ) override; // css::util::XCloseBroadcaster (base of XCloseable) virtual void SAL_CALL - addCloseListener( const css::uno::Reference< css::util::XCloseListener > & xListener ) - throw (css::uno::RuntimeException, std::exception) override; + addCloseListener( const css::uno::Reference< css::util::XCloseListener > & xListener ) override; virtual void SAL_CALL - removeCloseListener( const css::uno::Reference< css::util::XCloseListener > & xListener ) - throw (css::uno::RuntimeException, std::exception) override; + removeCloseListener( const css::uno::Reference< css::util::XCloseListener > & xListener ) override; // css::frame::XStorable2 (extension of XStorable) virtual void SAL_CALL storeSelf( - const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) - throw (css::lang::IllegalArgumentException, - css::io::IOException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) override; // css::frame::XStorable (required interface) virtual sal_Bool SAL_CALL - hasLocation() throw (css::uno::RuntimeException, std::exception) override; + hasLocation() override; virtual OUString SAL_CALL - getLocation() throw (css::uno::RuntimeException, std::exception) override; + getLocation() override; virtual sal_Bool SAL_CALL - isReadonly() throw (css::uno::RuntimeException, std::exception) override; + isReadonly() override; virtual void SAL_CALL - store() throw (css::io::IOException - , css::uno::RuntimeException, std::exception) override; + store() override; virtual void SAL_CALL storeAsURL( const OUString& rURL, - const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) - throw (css::io::IOException - , css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) override; virtual void SAL_CALL storeToURL( const OUString& rURL, - const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) - throw (css::io::IOException - , css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) override; // css::util::XModifiable (required interface) virtual sal_Bool SAL_CALL - isModified() throw (css::uno::RuntimeException, std::exception) override; + isModified() override; virtual void SAL_CALL - setModified( sal_Bool bModified ) - throw (css::beans::PropertyVetoException - , css::uno::RuntimeException, std::exception) override; + setModified( sal_Bool bModified ) override; // css::util::XModifyBroadcaster (base of XModifiable) virtual void SAL_CALL - addModifyListener( const css::uno::Reference< css::util::XModifyListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + addModifyListener( const css::uno::Reference< css::util::XModifyListener >& xListener ) override; virtual void SAL_CALL - removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& xListener ) override; // ____ XModifyListener ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; // ____ datatransferable::XTransferable ____ virtual css::uno::Any SAL_CALL getTransferData( - const css::datatransfer::DataFlavor& aFlavor ) - throw (css::datatransfer::UnsupportedFlavorException, - css::io::IOException, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors() - throw (css::uno::RuntimeException, std::exception) override; + const css::datatransfer::DataFlavor& aFlavor ) override; + virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors() override; virtual sal_Bool SAL_CALL isDataFlavorSupported( - const css::datatransfer::DataFlavor& aFlavor ) - throw (css::uno::RuntimeException, std::exception) override; + const css::datatransfer::DataFlavor& aFlavor ) override; // lang::XTypeProvider (override method of WeakImplHelper) virtual css::uno::Sequence< css::uno::Type > SAL_CALL - getTypes() throw (css::uno::RuntimeException, std::exception) override; + getTypes() override; // ____ document::XDocumentPropertiesSupplier ____ virtual css::uno::Reference< css::document::XDocumentProperties > SAL_CALL - getDocumentProperties( ) throw (css::uno::RuntimeException, std::exception) override; + getDocumentProperties( ) override; // ____ document::XUndoManagerSupplier ____ virtual css::uno::Reference< css::document::XUndoManager > SAL_CALL - getUndoManager( ) throw (css::uno::RuntimeException, std::exception) override; + getUndoManager( ) override; // css::chart2::XChartDocument virtual css::uno::Reference< css::chart2::XDiagram > SAL_CALL - getFirstDiagram() throw (css::uno::RuntimeException, std::exception) override; + getFirstDiagram() override; virtual void SAL_CALL setFirstDiagram( - const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) override; virtual void SAL_CALL - createInternalDataProvider( sal_Bool bCloneExistingData ) - throw (css::util::CloseVetoException, - css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasInternalDataProvider() - throw (css::uno::RuntimeException, std::exception) override; + createInternalDataProvider( sal_Bool bCloneExistingData ) override; + virtual sal_Bool SAL_CALL hasInternalDataProvider() override; virtual css::uno::Reference< css::chart2::data::XDataProvider > SAL_CALL - getDataProvider() - throw (css::uno::RuntimeException, std::exception) override; + getDataProvider() override; virtual void SAL_CALL - setChartTypeManager( const css::uno::Reference< css::chart2::XChartTypeManager >& xNewManager ) - throw (css::uno::RuntimeException, std::exception) override; + setChartTypeManager( const css::uno::Reference< css::chart2::XChartTypeManager >& xNewManager ) override; virtual css::uno::Reference< css::chart2::XChartTypeManager > SAL_CALL - getChartTypeManager() - throw (css::uno::RuntimeException, std::exception) override; + getChartTypeManager() override; virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL - getPageBackground() - throw (css::uno::RuntimeException, std::exception) override; + getPageBackground() override; - virtual void SAL_CALL createDefaultChart() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL createDefaultChart() override; - virtual sal_Bool SAL_CALL isOpenGLChart() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isOpenGLChart() override; // ____ XDataReceiver (public API) ____ virtual void SAL_CALL - attachDataProvider( const css::uno::Reference< css::chart2::data::XDataProvider >& xProvider ) - throw (css::uno::RuntimeException, std::exception) override; + attachDataProvider( const css::uno::Reference< css::chart2::data::XDataProvider >& xProvider ) override; virtual void SAL_CALL setArguments( - const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getUsedRangeRepresentations() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::chart2::data::XDataSource > SAL_CALL getUsedData() - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getUsedRangeRepresentations() override; + virtual css::uno::Reference< css::chart2::data::XDataSource > SAL_CALL getUsedData() override; virtual void SAL_CALL attachNumberFormatsSupplier( const css::uno::Reference< - css::util::XNumberFormatsSupplier >& xSupplier ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::chart2::data::XRangeHighlighter > SAL_CALL getRangeHighlighter() - throw (css::uno::RuntimeException, std::exception) override; + css::util::XNumberFormatsSupplier >& xSupplier ) override; + virtual css::uno::Reference< css::chart2::data::XRangeHighlighter > SAL_CALL getRangeHighlighter() override; // ____ XTitled ____ - virtual css::uno::Reference< css::chart2::XTitle > SAL_CALL getTitleObject() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTitleObject( const css::uno::Reference< css::chart2::XTitle >& Title ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::XTitle > SAL_CALL getTitleObject() override; + virtual void SAL_CALL setTitleObject( const css::uno::Reference< css::chart2::XTitle >& Title ) override; // ____ XInterface (for old API wrapper) ____ - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; // ____ XLoadable ____ - virtual void SAL_CALL initNew() - throw (css::frame::DoubleInitializationException, - css::io::IOException, - css::uno::Exception, - css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL load( const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) - throw (css::frame::DoubleInitializationException, - css::io::IOException, - css::uno::Exception, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initNew() override; + virtual void SAL_CALL load( const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; // ____ XVisualObject ____ virtual void SAL_CALL setVisualAreaSize( ::sal_Int64 nAspect, - const css::awt::Size& aSize ) - throw (css::lang::IllegalArgumentException, - css::embed::WrongStateException, - css::uno::Exception, - css::uno::RuntimeException, std::exception) override; + const css::awt::Size& aSize ) override; virtual css::awt::Size SAL_CALL getVisualAreaSize( - ::sal_Int64 nAspect ) - throw (css::lang::IllegalArgumentException, - css::embed::WrongStateException, - css::uno::Exception, - css::uno::RuntimeException, std::exception) override; + ::sal_Int64 nAspect ) override; virtual css::embed::VisualRepresentation SAL_CALL getPreferredVisualRepresentation( - ::sal_Int64 nAspect ) - throw (css::lang::IllegalArgumentException, - css::embed::WrongStateException, - css::uno::Exception, - css::uno::RuntimeException, std::exception) override; + ::sal_Int64 nAspect ) override; virtual ::sal_Int32 SAL_CALL getMapUnit( - ::sal_Int64 nAspect ) - throw (css::uno::Exception, - css::uno::RuntimeException, std::exception) override; + ::sal_Int64 nAspect ) override; // ____ XMultiServiceFactory ____ virtual css::uno::Reference< css::uno::XInterface > SAL_CALL - createInstance( const OUString& aServiceSpecifier ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + createInstance( const OUString& aServiceSpecifier ) override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier - , const css::uno::Sequence< css::uno::Any >& Arguments ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + , const css::uno::Sequence< css::uno::Any >& Arguments ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getAvailableServiceNames() throw (css::uno::RuntimeException, std::exception) override; + getAvailableServiceNames() override; // ____ XStorageBasedDocument ____ virtual void SAL_CALL loadFromStorage( const css::uno::Reference< css::embed::XStorage >& xStorage, - const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) - throw (css::lang::IllegalArgumentException, - css::frame::DoubleInitializationException, - css::io::IOException, - css::uno::Exception, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) override; virtual void SAL_CALL storeToStorage( const css::uno::Reference< css::embed::XStorage >& xStorage, - const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) - throw (css::lang::IllegalArgumentException, - css::io::IOException, - css::uno::Exception, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor ) override; virtual void SAL_CALL switchToStorage( - const css::uno::Reference< css::embed::XStorage >& xStorage ) - throw (css::lang::IllegalArgumentException, - css::io::IOException, - css::uno::Exception, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentStorage() - throw (css::io::IOException, - css::uno::Exception, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::embed::XStorage >& xStorage ) override; + virtual css::uno::Reference< css::embed::XStorage > SAL_CALL getDocumentStorage() override; virtual void SAL_CALL addStorageChangeListener( - const css::uno::Reference< css::document::XStorageChangeListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::document::XStorageChangeListener >& xListener ) override; virtual void SAL_CALL removeStorageChangeListener( - const css::uno::Reference< css::document::XStorageChangeListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::document::XStorageChangeListener >& xListener ) override; // for SvNumberFormatsSupplierObj // ____ XUnoTunnel ___ - virtual ::sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< ::sal_Int8 >& aIdentifier ) - throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< ::sal_Int8 >& aIdentifier ) override; // ____ XNumberFormatsSupplier ____ - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getNumberFormatSettings() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::util::XNumberFormats > SAL_CALL getNumberFormats() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getNumberFormatSettings() override; + virtual css::uno::Reference< css::util::XNumberFormats > SAL_CALL getNumberFormats() override; // ____ XChild ____ - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent() override; virtual void SAL_CALL setParent( - const css::uno::Reference< css::uno::XInterface >& Parent ) - throw (css::lang::NoSupportException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::uno::XInterface >& Parent ) override; // ____ XDataSource ____ allows access to the currently used data and data ranges - virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() override; // X3DChartWindowProvider - virtual void SAL_CALL setWindow( sal_uInt64 nWindowPtr ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setWindow( sal_uInt64 nWindowPtr ) override; // XUpdatable - virtual void SAL_CALL update() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL update() override; // XDumper - virtual OUString SAL_CALL dump() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL dump() override; // normal methods css::uno::Reference< css::util::XNumberFormatsSupplier > const & diff --git a/chart2/inc/ChartView.hxx b/chart2/inc/ChartView.hxx index aa1e30949da1..a7b545f49af0 100644 --- a/chart2/inc/ChartView.hxx +++ b/chart2/inc/ChartView.hxx @@ -113,16 +113,12 @@ public: virtual ~ChartView() override; // ___lang::XServiceInfo___ - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // ___lang::XInitialization___ - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // ___ExplicitValueProvider___ virtual bool getExplicitValuesForAxis( @@ -139,68 +135,56 @@ public: std::shared_ptr< DrawModelWrapper > getDrawModelWrapper() override; // ___XTransferable___ - virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) - throw (css::datatransfer::UnsupportedFlavorException - , css::io::IOException - , css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getTransferData( const css::datatransfer::DataFlavor& aFlavor ) override; + virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL getTransferDataFlavors( ) override; + virtual sal_Bool SAL_CALL isDataFlavorSupported( const css::datatransfer::DataFlavor& aFlavor ) override; // css::util::XEventListener (base of XCloseListener and XModifyListener) virtual void SAL_CALL - disposing( const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + disposing( const css::lang::EventObject& Source ) override; // css::util::XModifyListener virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; //SfxListener virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; // css::util::XModeChangeBroadcaster - virtual void SAL_CALL addModeChangeListener( const css::uno::Reference< css::util::XModeChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeModeChangeListener( const css::uno::Reference< css::util::XModeChangeListener >& _rxListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addModeChangeApproveListener( const css::uno::Reference< css::util::XModeChangeApproveListener >& _rxListener ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeModeChangeApproveListener( const css::uno::Reference< css::util::XModeChangeApproveListener >& _rxListener ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addModeChangeListener( const css::uno::Reference< css::util::XModeChangeListener >& _rxListener ) override; + virtual void SAL_CALL removeModeChangeListener( const css::uno::Reference< css::util::XModeChangeListener >& _rxListener ) override; + virtual void SAL_CALL addModeChangeApproveListener( const css::uno::Reference< css::util::XModeChangeApproveListener >& _rxListener ) override; + virtual void SAL_CALL removeModeChangeApproveListener( const css::uno::Reference< css::util::XModeChangeApproveListener >& _rxListener ) override; // css::util::XUpdatable - virtual void SAL_CALL update() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL update() override; // util::XUpdatable2 - virtual void SAL_CALL updateSoft() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateHard() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateSoft() override; + virtual void SAL_CALL updateHard() override; // css::beans::XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; // css::lang::XMultiServiceFactory - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( - const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() throw (css::uno::RuntimeException, std::exception) override; + const OUString& ServiceSpecifier, const css::uno::Sequence< css::uno::Any >& Arguments ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() override; // for ExplicitValueProvider // ____ XUnoTunnel ___ - virtual ::sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< ::sal_Int8 >& aIdentifier ) - throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< ::sal_Int8 >& aIdentifier ) override; // XDumper - virtual OUString SAL_CALL dump() - throw(css::uno::RuntimeException, - std::exception) override; + virtual OUString SAL_CALL dump() override; void setViewDirty(); void updateOpenGLWindow(); diff --git a/chart2/source/controller/accessibility/AccessibleBase.cxx b/chart2/source/controller/accessibility/AccessibleBase.cxx index 64fef563a974..4759754b95a3 100644 --- a/chart2/source/controller/accessibility/AccessibleBase.cxx +++ b/chart2/source/controller/accessibility/AccessibleBase.cxx @@ -100,7 +100,6 @@ AccessibleBase::~AccessibleBase() } bool AccessibleBase::CheckDisposeState( bool bThrowException /* default: true */ ) const - throw (lang::DisposedException) { if( bThrowException && m_bIsDisposed ) @@ -188,7 +187,6 @@ bool AccessibleBase::NotifyEvent( EventType eEventType, const AccessibleUniqueId } void AccessibleBase::AddState( sal_Int16 aState ) - throw (RuntimeException) { CheckDisposeState(); OSL_ASSERT( m_xStateSetHelper.is() ); @@ -196,7 +194,6 @@ void AccessibleBase::AddState( sal_Int16 aState ) } void AccessibleBase::RemoveState( sal_Int16 aState ) - throw (RuntimeException) { CheckDisposeState(); OSL_ASSERT( m_xStateSetHelper.is() ); @@ -473,14 +470,12 @@ void SAL_CALL AccessibleBase::disposing() // ________ XAccessible ________ Reference< XAccessibleContext > SAL_CALL AccessibleBase::getAccessibleContext() - throw (RuntimeException, std::exception) { return this; } // ________ AccessibleBase::XAccessibleContext ________ sal_Int32 SAL_CALL AccessibleBase::getAccessibleChildCount() - throw (RuntimeException, std::exception) { ClearableMutexGuard aGuard( GetMutex() ); if( ! m_bMayHaveChildren || @@ -500,13 +495,11 @@ sal_Int32 SAL_CALL AccessibleBase::getAccessibleChildCount() } sal_Int32 AccessibleBase::ImplGetAccessibleChildCount() const - throw (RuntimeException) { return m_aChildList.size(); } Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleChild( sal_Int32 i ) - throw (lang::IndexOutOfBoundsException, RuntimeException, std::exception) { CheckDisposeState(); Reference< XAccessible > xResult; @@ -526,7 +519,6 @@ Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleChild( sal_Int32 } Reference< XAccessible > AccessibleBase::ImplGetAccessibleChildById( sal_Int32 i ) const - throw (lang::IndexOutOfBoundsException, RuntimeException) { Reference< XAccessible > xResult; @@ -550,7 +542,6 @@ Reference< XAccessible > AccessibleBase::ImplGetAccessibleChildById( sal_Int32 i } Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleParent() - throw (RuntimeException, std::exception) { CheckDisposeState(); Reference< XAccessible > aResult; @@ -561,7 +552,6 @@ Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleParent() } sal_Int32 SAL_CALL AccessibleBase::getAccessibleIndexInParent() - throw (RuntimeException, std::exception) { CheckDisposeState(); @@ -571,20 +561,17 @@ sal_Int32 SAL_CALL AccessibleBase::getAccessibleIndexInParent() } sal_Int16 SAL_CALL AccessibleBase::getAccessibleRole() - throw (RuntimeException, std::exception) { return AccessibleRole::SHAPE; } Reference< XAccessibleRelationSet > SAL_CALL AccessibleBase::getAccessibleRelationSet() - throw (RuntimeException, std::exception) { Reference< XAccessibleRelationSet > aResult; return aResult; } Reference< XAccessibleStateSet > SAL_CALL AccessibleBase::getAccessibleStateSet() - throw (RuntimeException, std::exception) { if( ! m_bStateSetInitialized ) { @@ -605,7 +592,6 @@ Reference< XAccessibleStateSet > SAL_CALL AccessibleBase::getAccessibleStateSet( } lang::Locale SAL_CALL AccessibleBase::getLocale() - throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) { CheckDisposeState(); @@ -614,7 +600,6 @@ lang::Locale SAL_CALL AccessibleBase::getLocale() // ________ AccessibleBase::XAccessibleComponent ________ sal_Bool SAL_CALL AccessibleBase::containsPoint( const awt::Point& aPoint ) - throw (RuntimeException, std::exception) { awt::Rectangle aRect( getBounds() ); @@ -629,7 +614,6 @@ sal_Bool SAL_CALL AccessibleBase::containsPoint( const awt::Point& aPoint ) } Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleAtPoint( const awt::Point& aPoint ) - throw (RuntimeException, std::exception) { CheckDisposeState(); Reference< XAccessible > aResult; @@ -669,7 +653,6 @@ Reference< XAccessible > SAL_CALL AccessibleBase::getAccessibleAtPoint( const aw } awt::Rectangle SAL_CALL AccessibleBase::getBounds() - throw (RuntimeException, std::exception) { ExplicitValueProvider *pExplicitValueProvider( ExplicitValueProvider::getExplicitValueProvider( m_aAccInfo.m_xView )); @@ -705,7 +688,6 @@ awt::Rectangle SAL_CALL AccessibleBase::getBounds() } awt::Point SAL_CALL AccessibleBase::getLocation() - throw (RuntimeException, std::exception) { CheckDisposeState(); awt::Rectangle aBBox( getBounds() ); @@ -713,7 +695,6 @@ awt::Point SAL_CALL AccessibleBase::getLocation() } awt::Point SAL_CALL AccessibleBase::getLocationOnScreen() - throw (RuntimeException, std::exception) { CheckDisposeState(); @@ -734,7 +715,6 @@ awt::Point SAL_CALL AccessibleBase::getLocationOnScreen() } awt::Size SAL_CALL AccessibleBase::getSize() - throw (RuntimeException, std::exception) { CheckDisposeState(); awt::Rectangle aBBox( getBounds() ); @@ -742,7 +722,6 @@ awt::Size SAL_CALL AccessibleBase::getSize() } void SAL_CALL AccessibleBase::grabFocus() - throw (RuntimeException, std::exception) { CheckDisposeState(); @@ -754,13 +733,11 @@ void SAL_CALL AccessibleBase::grabFocus() } sal_Int32 SAL_CALL AccessibleBase::getForeground() - throw (RuntimeException, std::exception) { return getColor( ACC_BASE_FOREGROUND ); } sal_Int32 SAL_CALL AccessibleBase::getBackground() - throw (RuntimeException, std::exception) { return getColor( ACC_BASE_BACKGROUND ); } @@ -859,19 +836,16 @@ sal_Int32 AccessibleBase::getColor( eColorType eColType ) // ________ AccessibleBase::XServiceInfo ________ OUString SAL_CALL AccessibleBase::getImplementationName() - throw (RuntimeException, std::exception) { return OUString( "AccessibleBase" ); } sal_Bool SAL_CALL AccessibleBase::supportsService( const OUString& ServiceName ) - throw (RuntimeException, std::exception) { return cppu::supportsService( this, ServiceName ); } uno::Sequence< OUString > SAL_CALL AccessibleBase::getSupportedServiceNames() - throw (RuntimeException, std::exception) { return { "com.sun.star.accessibility.Accessible", @@ -881,13 +855,11 @@ uno::Sequence< OUString > SAL_CALL AccessibleBase::getSupportedServiceNames() // ________ AccessibleBase::XEventListener ________ void SAL_CALL AccessibleBase::disposing( const lang::EventObject& /*Source*/ ) - throw (RuntimeException, std::exception) { } // ________ XAccessibleEventBroadcasters ________ void SAL_CALL AccessibleBase::addAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) - throw (RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); @@ -901,7 +873,6 @@ void SAL_CALL AccessibleBase::addAccessibleEventListener( const Reference< XAcce } void SAL_CALL AccessibleBase::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& xListener ) - throw (RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.cxx b/chart2/source/controller/accessibility/AccessibleChartElement.cxx index d94233a76c2e..b231b030c56a 100644 --- a/chart2/source/controller/accessibility/AccessibleChartElement.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartElement.cxx @@ -115,7 +115,6 @@ void AccessibleChartElement::InitTextEdit() // ________ AccessibleBase::XAccessibleContext ________ Reference< XAccessible > AccessibleChartElement::ImplGetAccessibleChildById( sal_Int32 i ) const - throw (lang::IndexOutOfBoundsException, RuntimeException) { Reference< XAccessible > xResult; @@ -128,7 +127,6 @@ Reference< XAccessible > AccessibleChartElement::ImplGetAccessibleChildById( sal } sal_Int32 AccessibleChartElement::ImplGetAccessibleChildCount() const - throw (RuntimeException) { if( m_bHasText ) { @@ -142,14 +140,12 @@ sal_Int32 AccessibleChartElement::ImplGetAccessibleChildCount() const // ________ XServiceInfo ________ OUString SAL_CALL AccessibleChartElement::getImplementationName() - throw (RuntimeException, std::exception) { return OUString( "AccessibleChartElement" ); } // ________ AccessibleChartElement::XAccessibleContext (override) ________ OUString SAL_CALL AccessibleChartElement::getAccessibleName() - throw (css::uno::RuntimeException, std::exception) { return ObjectNameProvider::getNameForCID( GetInfo().m_aOID.getObjectCID(), GetInfo().m_xChartDocument ); @@ -157,14 +153,12 @@ OUString SAL_CALL AccessibleChartElement::getAccessibleName() // ________ AccessibleChartElement::XAccessibleContext (override) ________ OUString SAL_CALL AccessibleChartElement::getAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) { return getToolTipText(); } // ________ AccessibleChartElement::XAccessibleExtendedComponent ________ Reference< awt::XFont > SAL_CALL AccessibleChartElement::getFont() - throw (uno::RuntimeException, std::exception) { CheckDisposeState(); @@ -185,13 +179,11 @@ Reference< awt::XFont > SAL_CALL AccessibleChartElement::getFont() } OUString SAL_CALL AccessibleChartElement::getTitledBorderText() - throw (uno::RuntimeException, std::exception) { return OUString(); } OUString SAL_CALL AccessibleChartElement::getToolTipText() - throw (css::uno::RuntimeException, std::exception) { CheckDisposeState(); @@ -201,55 +193,46 @@ OUString SAL_CALL AccessibleChartElement::getToolTipText() // ________ XAccessibleComponent ________ sal_Bool SAL_CALL AccessibleChartElement::containsPoint( const awt::Point& aPoint ) - throw (uno::RuntimeException, std::exception) { return AccessibleBase::containsPoint( aPoint ); } Reference< XAccessible > SAL_CALL AccessibleChartElement::getAccessibleAtPoint( const awt::Point& aPoint ) - throw (uno::RuntimeException, std::exception) { return AccessibleBase::getAccessibleAtPoint( aPoint ); } awt::Rectangle SAL_CALL AccessibleChartElement::getBounds() - throw (uno::RuntimeException, std::exception) { return AccessibleBase::getBounds(); } awt::Point SAL_CALL AccessibleChartElement::getLocation() - throw (uno::RuntimeException, std::exception) { return AccessibleBase::getLocation(); } awt::Point SAL_CALL AccessibleChartElement::getLocationOnScreen() - throw (uno::RuntimeException, std::exception) { return AccessibleBase::getLocationOnScreen(); } awt::Size SAL_CALL AccessibleChartElement::getSize() - throw (uno::RuntimeException, std::exception) { return AccessibleBase::getSize(); } void SAL_CALL AccessibleChartElement::grabFocus() - throw (uno::RuntimeException, std::exception) { return AccessibleBase::grabFocus(); } sal_Int32 SAL_CALL AccessibleChartElement::getForeground() - throw (uno::RuntimeException, std::exception) { return AccessibleBase::getForeground(); } sal_Int32 SAL_CALL AccessibleChartElement::getBackground() - throw (uno::RuntimeException, std::exception) { return AccessibleBase::getBackground(); } diff --git a/chart2/source/controller/accessibility/AccessibleChartElement.hxx b/chart2/source/controller/accessibility/AccessibleChartElement.hxx index 58db7bd12501..a2e48d64ad87 100644 --- a/chart2/source/controller/accessibility/AccessibleChartElement.hxx +++ b/chart2/source/controller/accessibility/AccessibleChartElement.hxx @@ -75,44 +75,35 @@ public: // ________ AccessibleBase ________ virtual bool ImplUpdateChildren() override; virtual css::uno::Reference< css::accessibility::XAccessible > - ImplGetAccessibleChildById( sal_Int32 i ) const - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException) override; - virtual sal_Int32 ImplGetAccessibleChildCount() const - throw (css::uno::RuntimeException) override; + ImplGetAccessibleChildById( sal_Int32 i ) const override; + virtual sal_Int32 ImplGetAccessibleChildCount() const override; // ________ XAccessibleContext ________ - virtual OUString SAL_CALL getAccessibleName() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getAccessibleName() override; + virtual OUString SAL_CALL getAccessibleDescription() override; // ________ XAccessibleExtendedComponent ________ - virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTitledBorderText() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getToolTipText() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont() override; + virtual OUString SAL_CALL getTitledBorderText() override; + virtual OUString SAL_CALL getToolTipText() override; // the following interface is implemented in AccessibleBase, however it is // also a (non-virtual) base class of XAccessibleExtendedComponent Thus // these methods have to be overridden and forward to AccessibleBase // ________ XAccessibleComponent ________ - virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Rectangle SAL_CALL getBounds() throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Point SAL_CALL getLocation() throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Point SAL_CALL getLocationOnScreen() throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Size SAL_CALL getSize() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grabFocus() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getForeground() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getBackground() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override; + virtual css::awt::Rectangle SAL_CALL getBounds() override; + virtual css::awt::Point SAL_CALL getLocation() override; + virtual css::awt::Point SAL_CALL getLocationOnScreen() override; + virtual css::awt::Size SAL_CALL getSize() override; + virtual void SAL_CALL grabFocus() override; + virtual sal_Int32 SAL_CALL getForeground() override; + virtual sal_Int32 SAL_CALL getBackground() override; // ________ XServiceInfo ________ - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; private: bool m_bHasText; diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.cxx b/chart2/source/controller/accessibility/AccessibleChartShape.cxx index 3139f9dd66d2..2757cef19cb2 100644 --- a/chart2/source/controller/accessibility/AccessibleChartShape.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartShape.cxx @@ -75,14 +75,12 @@ AccessibleChartShape::~AccessibleChartShape() // ________ XServiceInfo ________ OUString AccessibleChartShape::getImplementationName() - throw (RuntimeException, std::exception) { return OUString( "AccessibleChartShape" ); } // ________ XAccessibleContext ________ sal_Int32 AccessibleChartShape::getAccessibleChildCount() - throw (RuntimeException, std::exception) { sal_Int32 nCount(0); if ( m_pAccShape.is() ) @@ -93,7 +91,6 @@ sal_Int32 AccessibleChartShape::getAccessibleChildCount() } Reference< XAccessible > AccessibleChartShape::getAccessibleChild( sal_Int32 i ) - throw (lang::IndexOutOfBoundsException, RuntimeException, std::exception) { Reference< XAccessible > xChild; if ( m_pAccShape.is() ) @@ -104,7 +101,6 @@ Reference< XAccessible > AccessibleChartShape::getAccessibleChild( sal_Int32 i ) } sal_Int16 AccessibleChartShape::getAccessibleRole() - throw (RuntimeException, std::exception) { sal_Int16 nRole(0); if ( m_pAccShape.is() ) @@ -115,7 +111,6 @@ sal_Int16 AccessibleChartShape::getAccessibleRole() } OUString AccessibleChartShape::getAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) { OUString aDescription; if ( m_pAccShape.is() ) @@ -126,7 +121,6 @@ OUString AccessibleChartShape::getAccessibleDescription() } OUString AccessibleChartShape::getAccessibleName() - throw (css::uno::RuntimeException, std::exception) { OUString aName; if ( m_pAccShape.is() ) @@ -138,7 +132,6 @@ OUString AccessibleChartShape::getAccessibleName() // ________ XAccessibleComponent ________ sal_Bool AccessibleChartShape::containsPoint( const awt::Point& aPoint ) - throw (uno::RuntimeException, std::exception) { bool bReturn = false; if ( m_pAccShape.is() ) @@ -149,7 +142,6 @@ sal_Bool AccessibleChartShape::containsPoint( const awt::Point& aPoint ) } Reference< XAccessible > AccessibleChartShape::getAccessibleAtPoint( const awt::Point& aPoint ) - throw (uno::RuntimeException, std::exception) { Reference< XAccessible > xResult; if ( m_pAccShape.is() ) @@ -160,7 +152,6 @@ Reference< XAccessible > AccessibleChartShape::getAccessibleAtPoint( const awt:: } awt::Rectangle AccessibleChartShape::getBounds() - throw (uno::RuntimeException, std::exception) { awt::Rectangle aBounds; if ( m_pAccShape.is() ) @@ -171,7 +162,6 @@ awt::Rectangle AccessibleChartShape::getBounds() } awt::Point AccessibleChartShape::getLocation() - throw (uno::RuntimeException, std::exception) { awt::Point aLocation; if ( m_pAccShape.is() ) @@ -182,7 +172,6 @@ awt::Point AccessibleChartShape::getLocation() } awt::Point AccessibleChartShape::getLocationOnScreen() - throw (uno::RuntimeException, std::exception) { awt::Point aLocation; if ( m_pAccShape.is() ) @@ -193,7 +182,6 @@ awt::Point AccessibleChartShape::getLocationOnScreen() } awt::Size AccessibleChartShape::getSize() - throw (uno::RuntimeException, std::exception) { awt::Size aSize; if ( m_pAccShape.is() ) @@ -204,13 +192,11 @@ awt::Size AccessibleChartShape::getSize() } void AccessibleChartShape::grabFocus() - throw (uno::RuntimeException, std::exception) { return AccessibleBase::grabFocus(); } sal_Int32 AccessibleChartShape::getForeground() - throw (uno::RuntimeException, std::exception) { sal_Int32 nColor(0); if ( m_pAccShape.is() ) @@ -221,7 +207,6 @@ sal_Int32 AccessibleChartShape::getForeground() } sal_Int32 AccessibleChartShape::getBackground() - throw (uno::RuntimeException, std::exception) { sal_Int32 nColor(0); if ( m_pAccShape.is() ) @@ -233,7 +218,6 @@ sal_Int32 AccessibleChartShape::getBackground() // ________ XAccessibleExtendedComponent ________ Reference< awt::XFont > AccessibleChartShape::getFont() - throw (uno::RuntimeException, std::exception) { Reference< awt::XFont > xFont; if ( m_pAccShape.is() ) @@ -244,7 +228,6 @@ Reference< awt::XFont > AccessibleChartShape::getFont() } OUString AccessibleChartShape::getTitledBorderText() - throw (uno::RuntimeException, std::exception) { OUString aText; if ( m_pAccShape.is() ) @@ -255,7 +238,6 @@ OUString AccessibleChartShape::getTitledBorderText() } OUString AccessibleChartShape::getToolTipText() - throw (css::uno::RuntimeException, std::exception) { OUString aText; if ( m_pAccShape.is() ) diff --git a/chart2/source/controller/accessibility/AccessibleChartShape.hxx b/chart2/source/controller/accessibility/AccessibleChartShape.hxx index 3108b18fd95d..6feaf9e295b9 100644 --- a/chart2/source/controller/accessibility/AccessibleChartShape.hxx +++ b/chart2/source/controller/accessibility/AccessibleChartShape.hxx @@ -48,41 +48,31 @@ public: virtual ~AccessibleChartShape() override; // ________ XServiceInfo ________ - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; // ________ XAccessibleContext ________ - virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleChild( sal_Int32 i ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getAccessibleRole() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleName() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleChild( sal_Int32 i ) override; + virtual sal_Int16 SAL_CALL getAccessibleRole() override; + virtual OUString SAL_CALL getAccessibleDescription() override; + virtual OUString SAL_CALL getAccessibleName() override; // ________ XAccessibleComponent ________ - virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Rectangle SAL_CALL getBounds() throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Point SAL_CALL getLocation() throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Point SAL_CALL getLocationOnScreen() throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Size SAL_CALL getSize() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grabFocus() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getForeground() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getBackground() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL containsPoint( const css::awt::Point& aPoint ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleAtPoint( const css::awt::Point& aPoint ) override; + virtual css::awt::Rectangle SAL_CALL getBounds() override; + virtual css::awt::Point SAL_CALL getLocation() override; + virtual css::awt::Point SAL_CALL getLocationOnScreen() override; + virtual css::awt::Size SAL_CALL getSize() override; + virtual void SAL_CALL grabFocus() override; + virtual sal_Int32 SAL_CALL getForeground() override; + virtual sal_Int32 SAL_CALL getBackground() override; // ________ XAccessibleExtendedComponent ________ - virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTitledBorderText() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getToolTipText() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XFont > SAL_CALL getFont() override; + virtual OUString SAL_CALL getTitledBorderText() override; + virtual OUString SAL_CALL getToolTipText() override; private: rtl::Reference m_pAccShape; diff --git a/chart2/source/controller/accessibility/AccessibleChartView.cxx b/chart2/source/controller/accessibility/AccessibleChartView.cxx index fac65a65c301..77c4457651a9 100644 --- a/chart2/source/controller/accessibility/AccessibleChartView.cxx +++ b/chart2/source/controller/accessibility/AccessibleChartView.cxx @@ -98,39 +98,33 @@ awt::Point AccessibleChartView::GetUpperLeftOnScreen() const // ________ XAccessibleContext ________ OUString SAL_CALL AccessibleChartView::getAccessibleName() - throw (uno::RuntimeException, std::exception) { return SCH_RESSTR(STR_OBJECT_DIAGRAM); } OUString SAL_CALL AccessibleChartView::getAccessibleDescription() - throw (uno::RuntimeException, std::exception) { return getAccessibleName(); } Reference< XAccessible > SAL_CALL AccessibleChartView::getAccessibleParent() - throw (uno::RuntimeException, std::exception) { return Reference< XAccessible >( m_xParent ); } sal_Int32 SAL_CALL AccessibleChartView::getAccessibleIndexInParent() - throw (uno::RuntimeException, std::exception) { // the document is always the only child of the window return 0; } sal_Int16 SAL_CALL AccessibleChartView::getAccessibleRole() - throw (uno::RuntimeException, std::exception) { return AccessibleRole::DOCUMENT; } // ________ XAccessibleComponent ________ awt::Rectangle SAL_CALL AccessibleChartView::getBounds() - throw (uno::RuntimeException, std::exception) { awt::Rectangle aResult( GetWindowPosSize()); Reference< XAccessible > xParent( m_xParent ); @@ -148,7 +142,6 @@ awt::Rectangle SAL_CALL AccessibleChartView::getBounds() } awt::Point SAL_CALL AccessibleChartView::getLocationOnScreen() - throw (uno::RuntimeException, std::exception) { awt::Rectangle aBounds( getBounds()); awt::Point aResult; @@ -167,7 +160,6 @@ awt::Point SAL_CALL AccessibleChartView::getLocationOnScreen() // lang::XInitialization void SAL_CALL AccessibleChartView::initialize( const Sequence< Any >& rArguments ) - throw (uno::Exception, uno::RuntimeException, std::exception) { //0: view::XSelectionSupplier offers notifications for selection changes and access to the selection itself //1: frame::XModel representing the chart model - offers access to object data @@ -334,7 +326,6 @@ void SAL_CALL AccessibleChartView::initialize( const Sequence< Any >& rArguments // view::XSelectionChangeListener void SAL_CALL AccessibleChartView::selectionChanged( const lang::EventObject& /*rEvent*/ ) - throw (uno::RuntimeException, std::exception) { Reference< view::XSelectionSupplier > xSelectionSupplier; { @@ -359,7 +350,6 @@ void SAL_CALL AccessibleChartView::selectionChanged( const lang::EventObject& /* // XEventListener void SAL_CALL AccessibleChartView::disposing( const lang::EventObject& /*Source*/ ) - throw (uno::RuntimeException, std::exception) { } diff --git a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx index 367c098c73b9..6276daf18d2e 100644 --- a/chart2/source/controller/accessibility/AccessibleTextHelper.cxx +++ b/chart2/source/controller/accessibility/AccessibleTextHelper.cxx @@ -57,8 +57,6 @@ AccessibleTextHelper::~AccessibleTextHelper() // ____ XInitialization ____ void SAL_CALL AccessibleTextHelper::initialize( const Sequence< uno::Any >& aArguments ) - throw (uno::Exception, - uno::RuntimeException, std::exception) { OUString aCID; Reference< XAccessible > xEventSource; @@ -100,7 +98,6 @@ void SAL_CALL AccessibleTextHelper::initialize( const Sequence< uno::Any >& aArg // ____ XAccessibleContext ____ ::sal_Int32 SAL_CALL AccessibleTextHelper::getAccessibleChildCount() - throw (uno::RuntimeException, std::exception) { if( m_pTextHelper ) { @@ -111,8 +108,6 @@ void SAL_CALL AccessibleTextHelper::initialize( const Sequence< uno::Any >& aArg } Reference< XAccessible > SAL_CALL AccessibleTextHelper::getAccessibleChild( ::sal_Int32 i ) - throw (lang::IndexOutOfBoundsException, - uno::RuntimeException, std::exception) { if( m_pTextHelper ) { @@ -123,57 +118,48 @@ Reference< XAccessible > SAL_CALL AccessibleTextHelper::getAccessibleChild( ::sa } Reference< XAccessible > SAL_CALL AccessibleTextHelper::getAccessibleParent() - throw (uno::RuntimeException, std::exception) { OSL_FAIL( "Not implemented in this helper" ); return Reference< XAccessible >(); } ::sal_Int32 SAL_CALL AccessibleTextHelper::getAccessibleIndexInParent() - throw (uno::RuntimeException, std::exception) { OSL_FAIL( "Not implemented in this helper" ); return -1; } ::sal_Int16 SAL_CALL AccessibleTextHelper::getAccessibleRole() - throw (uno::RuntimeException, std::exception) { OSL_FAIL( "Not implemented in this helper" ); return AccessibleRole::UNKNOWN; } OUString SAL_CALL AccessibleTextHelper::getAccessibleDescription() - throw (uno::RuntimeException, std::exception) { OSL_FAIL( "Not implemented in this helper" ); return OUString(); } OUString SAL_CALL AccessibleTextHelper::getAccessibleName() - throw (uno::RuntimeException, std::exception) { OSL_FAIL( "Not implemented in this helper" ); return OUString(); } Reference< XAccessibleRelationSet > SAL_CALL AccessibleTextHelper::getAccessibleRelationSet() - throw (uno::RuntimeException, std::exception) { OSL_FAIL( "Not implemented in this helper" ); return Reference< XAccessibleRelationSet >(); } Reference< XAccessibleStateSet > SAL_CALL AccessibleTextHelper::getAccessibleStateSet() - throw (uno::RuntimeException, std::exception) { OSL_FAIL( "Not implemented in this helper" ); return Reference< XAccessibleStateSet >(); } lang::Locale SAL_CALL AccessibleTextHelper::getLocale() - throw (IllegalAccessibleComponentStateException, - uno::RuntimeException, std::exception) { OSL_FAIL( "Not implemented in this helper" ); return lang::Locale(); diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx index 69c9183bae25..d18d405eadf0 100644 --- a/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.cxx @@ -84,40 +84,33 @@ AreaWrapper::~AreaWrapper() // ____ XShape ____ awt::Point SAL_CALL AreaWrapper::getPosition() - throw (uno::RuntimeException, std::exception) { return awt::Point(0,0); } void SAL_CALL AreaWrapper::setPosition( const awt::Point& /*aPosition*/ ) - throw (uno::RuntimeException, std::exception) { OSL_FAIL( "trying to set position of chart area" ); } awt::Size SAL_CALL AreaWrapper::getSize() - throw (uno::RuntimeException, std::exception) { return m_spChart2ModelContact->GetPageSize(); } void SAL_CALL AreaWrapper::setSize( const awt::Size& /*aSize*/ ) - throw (beans::PropertyVetoException, - uno::RuntimeException, std::exception) { OSL_FAIL( "trying to set size of chart area" ); } // ____ XShapeDescriptor (base of XShape) ____ OUString SAL_CALL AreaWrapper::getShapeType() - throw (uno::RuntimeException, std::exception) { return OUString( "com.sun.star.chart.ChartArea" ); } // ____ XComponent ____ void SAL_CALL AreaWrapper::dispose() - throw (uno::RuntimeException, std::exception) { Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -128,14 +121,12 @@ void SAL_CALL AreaWrapper::dispose() void SAL_CALL AreaWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL AreaWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } @@ -165,19 +156,16 @@ const std::vector< WrappedProperty* > AreaWrapper::createWrappedProperties() } OUString SAL_CALL AreaWrapper::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.Area"); } sal_Bool SAL_CALL AreaWrapper::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL AreaWrapper::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.xml.UserDefinedAttributesSupplier", diff --git a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx index de77aafe0472..bd5fad7298a1 100644 --- a/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/AreaWrapper.hxx @@ -51,37 +51,25 @@ public: virtual ~AreaWrapper() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // ____ XShape ____ - virtual css::awt::Point SAL_CALL getPosition() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Size SAL_CALL getSize() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSize( const css::awt::Size& aSize ) - throw (css::beans::PropertyVetoException, - css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getPosition() override; + virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override; + virtual css::awt::Size SAL_CALL getSize() override; + virtual void SAL_CALL setSize( const css::awt::Size& aSize ) override; // ____ XShapeDescriptor (base of XShape) ____ - virtual OUString SAL_CALL getShapeType() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getShapeType() override; // ____ XComponent ____ - virtual void SAL_CALL dispose() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; virtual void SAL_CALL addEventListener( const css::uno::Reference< - css::lang::XEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + css::lang::XEventListener >& xListener ) override; virtual void SAL_CALL removeEventListener( const css::uno::Reference< - css::lang::XEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + css::lang::XEventListener >& aListener ) override; protected: // ____ WrappedPropertySet ____ diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx index cfab846edcd3..a7b088083ff8 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.cxx @@ -412,7 +412,7 @@ AxisWrapper::~AxisWrapper() } // ____ chart::XAxis ____ -Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getAxisTitle() throw (uno::RuntimeException, std::exception) +Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getAxisTitle() { if( !m_xAxisTitle.is() ) { @@ -441,7 +441,7 @@ Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getAxisTitle() throw (uno } return m_xAxisTitle; } -Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMajorGrid() throw (uno::RuntimeException, std::exception) +Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMajorGrid() { if( !m_xMajorGrid.is() ) { @@ -464,7 +464,7 @@ Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMajorGrid() throw (uno } return m_xMajorGrid; } -Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMinorGrid() throw (uno::RuntimeException, std::exception) +Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMinorGrid() { if( !m_xMinorGrid.is() ) { @@ -490,42 +490,35 @@ Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getMinorGrid() throw (uno // ____ XShape ____ awt::Point SAL_CALL AxisWrapper::getPosition() - throw (uno::RuntimeException, std::exception) { awt::Point aResult( m_spChart2ModelContact->GetAxisPosition( this->getAxis() ) ); return aResult; } void SAL_CALL AxisWrapper::setPosition( const awt::Point& /*aPosition*/ ) - throw (uno::RuntimeException, std::exception) { OSL_FAIL( "trying to set position of Axis" ); } awt::Size SAL_CALL AxisWrapper::getSize() - throw (uno::RuntimeException, std::exception) { awt::Size aSize( m_spChart2ModelContact->GetAxisSize( this->getAxis() ) ); return aSize; } void SAL_CALL AxisWrapper::setSize( const awt::Size& /*aSize*/ ) - throw (beans::PropertyVetoException, - uno::RuntimeException, std::exception) { OSL_FAIL( "trying to set size of Axis" ); } // ____ XShapeDescriptor (base of XShape) ____ OUString SAL_CALL AxisWrapper::getShapeType() - throw (uno::RuntimeException, std::exception) { return OUString("com.sun.star.chart.ChartAxis"); } // ____ XNumberFormatsSupplier ____ uno::Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getNumberFormatSettings() - throw (uno::RuntimeException, std::exception) { Reference< util::XNumberFormatsSupplier > xNumSuppl( m_spChart2ModelContact->getChartModel(), uno::UNO_QUERY ); if( xNumSuppl.is() ) @@ -535,7 +528,6 @@ uno::Reference< beans::XPropertySet > SAL_CALL AxisWrapper::getNumberFormatSetti } uno::Reference< util::XNumberFormats > SAL_CALL AxisWrapper::getNumberFormats() - throw (uno::RuntimeException, std::exception) { Reference< util::XNumberFormatsSupplier > xNumSuppl( m_spChart2ModelContact->getChartModel(), uno::UNO_QUERY ); if( xNumSuppl.is() ) @@ -563,7 +555,6 @@ void AxisWrapper::getDimensionAndMainAxisBool( tAxisType eType, sal_Int32& rnDim // ____ XComponent ____ void SAL_CALL AxisWrapper::dispose() - throw (uno::RuntimeException, std::exception) { Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -577,14 +568,12 @@ void SAL_CALL AxisWrapper::dispose() void SAL_CALL AxisWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL AxisWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } @@ -691,19 +680,16 @@ const std::vector< WrappedProperty* > AxisWrapper::createWrappedProperties() } OUString SAL_CALL AxisWrapper::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.Axis"); } sal_Bool SAL_CALL AxisWrapper::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL AxisWrapper::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart.ChartAxis", diff --git a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx index 352778b8f0b3..4adc3b77ff36 100644 --- a/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/AxisWrapper.hxx @@ -67,12 +67,9 @@ public: static void getDimensionAndMainAxisBool( tAxisType eType, sal_Int32& rnDimensionIndex, bool& rbMainAxis ); /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; //ReferenceSizePropertyProvider virtual void updateReferenceSize() override; @@ -80,42 +77,31 @@ public: virtual css::awt::Size getCurrentSizeForReference() override; // ____ XComponent ____ - virtual void SAL_CALL dispose() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; virtual void SAL_CALL addEventListener( const css::uno::Reference< - css::lang::XEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + css::lang::XEventListener >& xListener ) override; virtual void SAL_CALL removeEventListener( const css::uno::Reference< - css::lang::XEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + css::lang::XEventListener >& aListener ) override; // ____ chart::XAxis ____ - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getAxisTitle( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getMajorGrid( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getMinorGrid( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getAxisTitle( ) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getMajorGrid( ) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getMinorGrid( ) override; // ____ XShape ____ - virtual css::awt::Point SAL_CALL getPosition() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Size SAL_CALL getSize() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSize( const css::awt::Size& aSize ) - throw (css::beans::PropertyVetoException, - css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getPosition() override; + virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override; + virtual css::awt::Size SAL_CALL getSize() override; + virtual void SAL_CALL setSize( const css::awt::Size& aSize ) override; // ____ XShapeDescriptor (base of XShape) ____ - virtual OUString SAL_CALL getShapeType() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getShapeType() override; // ____ XNumberFormatsSupplier ____ virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getNumberFormatSettings() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getNumberFormatSettings() override; virtual css::uno::Reference< - css::util::XNumberFormats > SAL_CALL getNumberFormats() - throw (css::uno::RuntimeException, std::exception) override; + css::util::XNumberFormats > SAL_CALL getNumberFormats() override; protected: // ____ WrappedPropertySet ____ diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx index 2378a1d579bf..705f9fc2eb1e 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.cxx @@ -413,7 +413,6 @@ ChartDataWrapper::~ChartDataWrapper() // ____ XChartDataArray (read)____ Sequence< Sequence< double > > SAL_CALL ChartDataWrapper::getData() - throw (uno::RuntimeException, std::exception) { initDataAccess(); if( m_xDataAccess.is() ) @@ -421,7 +420,6 @@ Sequence< Sequence< double > > SAL_CALL ChartDataWrapper::getData() return Sequence< Sequence< double > >(); } Sequence< OUString > SAL_CALL ChartDataWrapper::getRowDescriptions() - throw (uno::RuntimeException, std::exception) { initDataAccess(); if( m_xDataAccess.is() ) @@ -429,7 +427,6 @@ Sequence< OUString > SAL_CALL ChartDataWrapper::getRowDescriptions() return Sequence< OUString >(); } Sequence< OUString > SAL_CALL ChartDataWrapper::getColumnDescriptions() - throw (uno::RuntimeException, std::exception) { initDataAccess(); if( m_xDataAccess.is() ) @@ -438,14 +435,14 @@ Sequence< OUString > SAL_CALL ChartDataWrapper::getColumnDescriptions() } // ____ XComplexDescriptionAccess (read) ____ -Sequence< Sequence< OUString > > SAL_CALL ChartDataWrapper::getComplexRowDescriptions() throw (uno::RuntimeException, std::exception) +Sequence< Sequence< OUString > > SAL_CALL ChartDataWrapper::getComplexRowDescriptions() { initDataAccess(); if( m_xDataAccess.is() ) return m_xDataAccess->getComplexRowDescriptions(); return Sequence< Sequence< OUString > >(); } -Sequence< Sequence< OUString > > SAL_CALL ChartDataWrapper::getComplexColumnDescriptions() throw (uno::RuntimeException, std::exception) +Sequence< Sequence< OUString > > SAL_CALL ChartDataWrapper::getComplexColumnDescriptions() { initDataAccess(); if( m_xDataAccess.is() ) @@ -454,14 +451,14 @@ Sequence< Sequence< OUString > > SAL_CALL ChartDataWrapper::getComplexColumnDesc } // ____ XAnyDescriptionAccess (read) ____ -Sequence< Sequence< uno::Any > > SAL_CALL ChartDataWrapper::getAnyRowDescriptions() throw (uno::RuntimeException, std::exception) +Sequence< Sequence< uno::Any > > SAL_CALL ChartDataWrapper::getAnyRowDescriptions() { initDataAccess(); if( m_xDataAccess.is() ) return m_xDataAccess->getAnyRowDescriptions(); return Sequence< Sequence< uno::Any > >(); } -Sequence< Sequence< uno::Any > > SAL_CALL ChartDataWrapper::getAnyColumnDescriptions() throw (uno::RuntimeException, std::exception) +Sequence< Sequence< uno::Any > > SAL_CALL ChartDataWrapper::getAnyColumnDescriptions() { initDataAccess(); if( m_xDataAccess.is() ) @@ -470,7 +467,7 @@ Sequence< Sequence< uno::Any > > SAL_CALL ChartDataWrapper::getAnyColumnDescript } // ____ XDateCategories (read) ____ -Sequence< double > SAL_CALL ChartDataWrapper::getDateCategories() throw (uno::RuntimeException, std::exception) +Sequence< double > SAL_CALL ChartDataWrapper::getDateCategories() { initDataAccess(); Reference< XDateCategories > xDateCategories( m_xDataAccess, uno::UNO_QUERY ); @@ -481,50 +478,47 @@ Sequence< double > SAL_CALL ChartDataWrapper::getDateCategories() throw (uno::Ru // ____ XChartDataArray (write)____ void SAL_CALL ChartDataWrapper::setData( const Sequence< Sequence< double > >& rData ) - throw (uno::RuntimeException, std::exception) { lcl_DataOperator aOperator( rData ); applyData( aOperator ); } void SAL_CALL ChartDataWrapper::setRowDescriptions( const Sequence< OUString >& rRowDescriptions ) - throw (uno::RuntimeException, std::exception) { lcl_RowDescriptionsOperator aOperator( rRowDescriptions, m_spChart2ModelContact->getChart2Document() ); applyData( aOperator ); } void SAL_CALL ChartDataWrapper::setColumnDescriptions( const Sequence< OUString >& rColumnDescriptions ) - throw (uno::RuntimeException, std::exception) { lcl_ColumnDescriptionsOperator aOperator( rColumnDescriptions, m_spChart2ModelContact->getChart2Document() ); applyData( aOperator ); } // ____ XComplexDescriptionAccess (write) ____ -void SAL_CALL ChartDataWrapper::setComplexRowDescriptions( const Sequence< Sequence< OUString > >& rRowDescriptions ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ChartDataWrapper::setComplexRowDescriptions( const Sequence< Sequence< OUString > >& rRowDescriptions ) { lcl_ComplexRowDescriptionsOperator aOperator( rRowDescriptions, m_spChart2ModelContact->getChart2Document() ); applyData( aOperator ); } -void SAL_CALL ChartDataWrapper::setComplexColumnDescriptions( const Sequence< Sequence< OUString > >& rColumnDescriptions ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ChartDataWrapper::setComplexColumnDescriptions( const Sequence< Sequence< OUString > >& rColumnDescriptions ) { lcl_ComplexColumnDescriptionsOperator aOperator( rColumnDescriptions, m_spChart2ModelContact->getChart2Document() ); applyData( aOperator ); } // ____ XAnyDescriptionAccess (write) ____ -void SAL_CALL ChartDataWrapper::setAnyRowDescriptions( const Sequence< Sequence< uno::Any > >& rRowDescriptions ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ChartDataWrapper::setAnyRowDescriptions( const Sequence< Sequence< uno::Any > >& rRowDescriptions ) { lcl_AnyRowDescriptionsOperator aOperator( rRowDescriptions ); applyData( aOperator ); } -void SAL_CALL ChartDataWrapper::setAnyColumnDescriptions( const Sequence< Sequence< uno::Any > >& rColumnDescriptions ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ChartDataWrapper::setAnyColumnDescriptions( const Sequence< Sequence< uno::Any > >& rColumnDescriptions ) { lcl_AnyColumnDescriptionsOperator aOperator( rColumnDescriptions ); applyData( aOperator ); } // ____ XDateCategories (write) ____ -void SAL_CALL ChartDataWrapper::setDateCategories( const Sequence< double >& rDates ) throw (uno::RuntimeException, std::exception) +void SAL_CALL ChartDataWrapper::setDateCategories( const Sequence< double >& rDates ) { Reference< chart2::XChartDocument > xChartDoc( m_spChart2ModelContact->getChart2Document() ); ControllerLockGuardUNO aCtrlLockGuard( uno::Reference< frame::XModel >( xChartDoc, uno::UNO_QUERY )); @@ -536,26 +530,22 @@ void SAL_CALL ChartDataWrapper::setDateCategories( const Sequence< double >& rDa // ____ XChartData (base of XChartDataArray) ____ void SAL_CALL ChartDataWrapper::addChartDataChangeEventListener( const uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( aListener ); } void SAL_CALL ChartDataWrapper::removeChartDataChangeEventListener( const uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } double SAL_CALL ChartDataWrapper::getNotANumber() - throw (uno::RuntimeException, std::exception) { return DBL_MIN; } sal_Bool SAL_CALL ChartDataWrapper::isNotANumber( double nNumber ) - throw (uno::RuntimeException, std::exception) { return DBL_MIN == nNumber || ::rtl::math::isNan( nNumber ) @@ -564,7 +554,6 @@ sal_Bool SAL_CALL ChartDataWrapper::isNotANumber( double nNumber ) // ____ XComponent ____ void SAL_CALL ChartDataWrapper::dispose() - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.disposeAndClear( lang::EventObject( static_cast< ::cppu::OWeakObject* >( this ))); m_xDataAccess=nullptr; @@ -572,21 +561,18 @@ void SAL_CALL ChartDataWrapper::dispose() void SAL_CALL ChartDataWrapper::addEventListener( const uno::Reference< lang::XEventListener > & xListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL ChartDataWrapper::removeEventListener( const uno::Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } // ____ XEventListener ____ void SAL_CALL ChartDataWrapper::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException, std::exception) { } @@ -702,19 +688,16 @@ void ChartDataWrapper::applyData( lcl_Operator& rDataOperator ) } OUString SAL_CALL ChartDataWrapper::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.ChartData"); } sal_Bool SAL_CALL ChartDataWrapper::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL ChartDataWrapper::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart.ChartDataArray", diff --git a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx index 34a35ee7643b..a15a2d06ab70 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/ChartDataWrapper.hxx @@ -54,77 +54,56 @@ public: virtual ~ChartDataWrapper() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; protected: // ____ XDateCategories ____ - virtual css::uno::Sequence< double > SAL_CALL getDateCategories() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDateCategories( const css::uno::Sequence< double >& rDates ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< double > SAL_CALL getDateCategories() override; + virtual void SAL_CALL setDateCategories( const css::uno::Sequence< double >& rDates ) override; // ____ XAnyDescriptionAccess ____ virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > > SAL_CALL - getAnyRowDescriptions() throw (css::uno::RuntimeException, std::exception) override; + getAnyRowDescriptions() override; virtual void SAL_CALL setAnyRowDescriptions( - const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aRowDescriptions ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aRowDescriptions ) override; virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > > SAL_CALL - getAnyColumnDescriptions() throw (css::uno::RuntimeException, std::exception) override; + getAnyColumnDescriptions() override; virtual void SAL_CALL setAnyColumnDescriptions( - const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aColumnDescriptions ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aColumnDescriptions ) override; // ____ XComplexDescriptionAccess (base of XAnyDescriptionAccess) ____ virtual css::uno::Sequence< css::uno::Sequence< OUString > > SAL_CALL - getComplexRowDescriptions() throw (css::uno::RuntimeException, std::exception) override; + getComplexRowDescriptions() override; virtual void SAL_CALL setComplexRowDescriptions( - const css::uno::Sequence< css::uno::Sequence< OUString > >& aRowDescriptions ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Sequence< OUString > >& aRowDescriptions ) override; virtual css::uno::Sequence< css::uno::Sequence< OUString > > SAL_CALL - getComplexColumnDescriptions() throw (css::uno::RuntimeException, std::exception) override; + getComplexColumnDescriptions() override; virtual void SAL_CALL setComplexColumnDescriptions( - const css::uno::Sequence< css::uno::Sequence< OUString > >& aColumnDescriptions ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Sequence< OUString > >& aColumnDescriptions ) override; // ____ XChartDataArray (base of XComplexDescriptionAccess) ____ - virtual css::uno::Sequence< css::uno::Sequence< double > > SAL_CALL getData() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Sequence< double > >& aData ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getRowDescriptions() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRowDescriptions( const css::uno::Sequence< OUString >& aRowDescriptions ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getColumnDescriptions() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setColumnDescriptions( const css::uno::Sequence< OUString >& aColumnDescriptions ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Sequence< double > > SAL_CALL getData() override; + virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Sequence< double > >& aData ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getRowDescriptions() override; + virtual void SAL_CALL setRowDescriptions( const css::uno::Sequence< OUString >& aRowDescriptions ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getColumnDescriptions() override; + virtual void SAL_CALL setColumnDescriptions( const css::uno::Sequence< OUString >& aColumnDescriptions ) override; // ____ XChartData (base of XChartDataArray) ____ - virtual void SAL_CALL addChartDataChangeEventListener( const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeChartDataChangeEventListener( const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getNotANumber() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isNotANumber( double nNumber ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addChartDataChangeEventListener( const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) override; + virtual void SAL_CALL removeChartDataChangeEventListener( const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) override; + virtual double SAL_CALL getNotANumber() override; + virtual sal_Bool SAL_CALL isNotANumber( double nNumber ) override; // ____ XComponent ____ - virtual void SAL_CALL dispose() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; // ____ XEventListener ____ - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; void fireChartDataChangeEvent( css::chart::ChartDataChangeEvent& aEvent ); diff --git a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx index 4f46ea84cb16..f98a743814c4 100644 --- a/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/ChartDocumentWrapper.cxx @@ -273,14 +273,11 @@ class WrappedDataSourceLabelsInFirstRowProperty : public WrappedProperty public: explicit WrappedDataSourceLabelsInFirstRowProperty(const std::shared_ptr& spChart2ModelContact); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -296,7 +293,6 @@ WrappedDataSourceLabelsInFirstRowProperty::WrappedDataSourceLabelsInFirstRowProp } void WrappedDataSourceLabelsInFirstRowProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { bool bLabelsInFirstRow = true; if( ! (rOuterValue >>= bLabelsInFirstRow) ) @@ -329,7 +325,6 @@ void WrappedDataSourceLabelsInFirstRowProperty::setPropertyValue( const Any& rOu } Any WrappedDataSourceLabelsInFirstRowProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OUString aRangeString; bool bUseColumns = true; @@ -353,7 +348,6 @@ Any WrappedDataSourceLabelsInFirstRowProperty::getPropertyValue( const Reference } Any WrappedDataSourceLabelsInFirstRowProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= true; @@ -366,14 +360,11 @@ class WrappedDataSourceLabelsInFirstColumnProperty : public WrappedProperty public: explicit WrappedDataSourceLabelsInFirstColumnProperty(const std::shared_ptr& spChart2ModelContact); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -389,7 +380,6 @@ WrappedDataSourceLabelsInFirstColumnProperty::WrappedDataSourceLabelsInFirstColu } void WrappedDataSourceLabelsInFirstColumnProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { bool bLabelsInFirstRow = true; if( ! (rOuterValue >>= bLabelsInFirstRow) ) @@ -422,7 +412,6 @@ void WrappedDataSourceLabelsInFirstColumnProperty::setPropertyValue( const Any& } Any WrappedDataSourceLabelsInFirstColumnProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OUString aRangeString; bool bUseColumns = true; @@ -446,7 +435,6 @@ Any WrappedDataSourceLabelsInFirstColumnProperty::getPropertyValue( const Refere } Any WrappedDataSourceLabelsInFirstColumnProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= true; @@ -459,14 +447,11 @@ class WrappedHasLegendProperty : public WrappedProperty public: explicit WrappedHasLegendProperty(const std::shared_ptr& spChart2ModelContact); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -479,7 +464,6 @@ WrappedHasLegendProperty::WrappedHasLegendProperty(const std::shared_ptr& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { bool bNewValue = true; if( ! (rOuterValue >>= bNewValue) ) @@ -505,7 +489,6 @@ void WrappedHasLegendProperty::setPropertyValue( const Any& rOuterValue, const R } Any WrappedHasLegendProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; try @@ -525,7 +508,6 @@ Any WrappedHasLegendProperty::getPropertyValue( const Reference< beans::XPropert } Any WrappedHasLegendProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= false; @@ -538,14 +520,11 @@ class WrappedHasMainTitleProperty : public WrappedProperty public: explicit WrappedHasMainTitleProperty(const std::shared_ptr& spChart2ModelContact); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -558,7 +537,6 @@ WrappedHasMainTitleProperty::WrappedHasMainTitleProperty(const std::shared_ptr& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { bool bNewValue = true; if( ! (rOuterValue >>= bNewValue) ) @@ -578,7 +556,6 @@ void WrappedHasMainTitleProperty::setPropertyValue( const Any& rOuterValue, cons } Any WrappedHasMainTitleProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; try @@ -593,7 +570,6 @@ Any WrappedHasMainTitleProperty::getPropertyValue( const Reference< beans::XProp } Any WrappedHasMainTitleProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= false; @@ -606,14 +582,11 @@ class WrappedHasSubTitleProperty : public WrappedProperty public: explicit WrappedHasSubTitleProperty(const std::shared_ptr& spChart2ModelContact); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -626,7 +599,6 @@ WrappedHasSubTitleProperty::WrappedHasSubTitleProperty(const std::shared_ptr& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { bool bNewValue = true; if( ! (rOuterValue >>= bNewValue) ) @@ -646,7 +618,6 @@ void WrappedHasSubTitleProperty::setPropertyValue( const Any& rOuterValue, const } Any WrappedHasSubTitleProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; try @@ -661,7 +632,6 @@ Any WrappedHasSubTitleProperty::getPropertyValue( const Reference< beans::XPrope } Any WrappedHasSubTitleProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= false; @@ -683,7 +653,6 @@ ChartDocumentWrapper::~ChartDocumentWrapper() // ____ XInterface (for new interfaces) ____ uno::Any SAL_CALL ChartDocumentWrapper::queryInterface( const uno::Type& aType ) - throw (uno::RuntimeException, std::exception) { if( m_xDelegator.is()) // calls queryAggregation if the delegator doesn't know aType @@ -694,7 +663,6 @@ uno::Any SAL_CALL ChartDocumentWrapper::queryInterface( const uno::Type& aType ) // ____ chart::XChartDocument (old API wrapper) ____ Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getTitle() - throw (uno::RuntimeException, std::exception) { if( !m_xTitle.is() ) { @@ -705,7 +673,6 @@ Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getTitle() } Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getSubTitle() - throw (uno::RuntimeException, std::exception) { if( !m_xSubTitle.is() ) { @@ -716,7 +683,6 @@ Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getSubTitle() } Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getLegend() - throw (uno::RuntimeException, std::exception) { if( ! m_xLegend.is()) { @@ -728,7 +694,6 @@ Reference< drawing::XShape > SAL_CALL ChartDocumentWrapper::getLegend() } Reference< beans::XPropertySet > SAL_CALL ChartDocumentWrapper::getArea() - throw (uno::RuntimeException, std::exception) { if( ! m_xArea.is()) { @@ -740,7 +705,6 @@ Reference< beans::XPropertySet > SAL_CALL ChartDocumentWrapper::getArea() } Reference< XDiagram > SAL_CALL ChartDocumentWrapper::getDiagram() - throw (uno::RuntimeException, std::exception) { if( !m_xDiagram.is() ) { @@ -758,7 +722,6 @@ Reference< XDiagram > SAL_CALL ChartDocumentWrapper::getDiagram() } void SAL_CALL ChartDocumentWrapper::setDiagram( const Reference< XDiagram >& xDiagram ) - throw (uno::RuntimeException, std::exception) { uno::Reference< util::XRefreshable > xAddIn( xDiagram, uno::UNO_QUERY ); if( xAddIn.is() ) @@ -791,7 +754,6 @@ void SAL_CALL ChartDocumentWrapper::setDiagram( const Reference< XDiagram >& xDi } Reference< XChartData > SAL_CALL ChartDocumentWrapper::getData() - throw (uno::RuntimeException, std::exception) { if( !m_xChartData.is() ) { @@ -803,7 +765,6 @@ Reference< XChartData > SAL_CALL ChartDocumentWrapper::getData() } void SAL_CALL ChartDocumentWrapper::attachData( const Reference< XChartData >& xNewData ) - throw (uno::RuntimeException, std::exception) { if( !xNewData.is() ) return; @@ -816,7 +777,6 @@ void SAL_CALL ChartDocumentWrapper::attachData( const Reference< XChartData >& x sal_Bool SAL_CALL ChartDocumentWrapper::attachResource( const OUString& URL, const Sequence< beans::PropertyValue >& Arguments ) - throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -825,7 +785,6 @@ sal_Bool SAL_CALL ChartDocumentWrapper::attachResource( } OUString SAL_CALL ChartDocumentWrapper::getURL() - throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -834,7 +793,6 @@ OUString SAL_CALL ChartDocumentWrapper::getURL() } Sequence< beans::PropertyValue > SAL_CALL ChartDocumentWrapper::getArgs() - throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -843,7 +801,6 @@ Sequence< beans::PropertyValue > SAL_CALL ChartDocumentWrapper::getArgs() } void SAL_CALL ChartDocumentWrapper::connectController( const Reference< frame::XController >& Controller ) - throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -852,7 +809,6 @@ void SAL_CALL ChartDocumentWrapper::connectController( const Reference< frame::X void SAL_CALL ChartDocumentWrapper::disconnectController( const Reference< frame::XController >& Controller ) - throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -860,7 +816,6 @@ void SAL_CALL ChartDocumentWrapper::disconnectController( } void SAL_CALL ChartDocumentWrapper::lockControllers() - throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -868,7 +823,6 @@ void SAL_CALL ChartDocumentWrapper::lockControllers() } void SAL_CALL ChartDocumentWrapper::unlockControllers() - throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -876,7 +830,6 @@ void SAL_CALL ChartDocumentWrapper::unlockControllers() } sal_Bool SAL_CALL ChartDocumentWrapper::hasControllersLocked() - throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -885,7 +838,6 @@ sal_Bool SAL_CALL ChartDocumentWrapper::hasControllersLocked() } Reference< frame::XController > SAL_CALL ChartDocumentWrapper::getCurrentController() - throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -895,8 +847,6 @@ Reference< frame::XController > SAL_CALL ChartDocumentWrapper::getCurrentControl void SAL_CALL ChartDocumentWrapper::setCurrentController( const Reference< frame::XController >& Controller ) - throw (container::NoSuchElementException, - uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -904,7 +854,6 @@ void SAL_CALL ChartDocumentWrapper::setCurrentController( } Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::getCurrentSelection() - throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -914,7 +863,6 @@ Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::getCurrentSelection( // ____ XComponent ____ void SAL_CALL ChartDocumentWrapper::dispose() - throw (uno::RuntimeException, std::exception) { if( m_bIsDisposed ) throw lang::DisposedException("ChartDocumentWrapper is disposed", @@ -1074,7 +1022,6 @@ Reference< drawing::XShapes > ChartDocumentWrapper::getAdditionalShapes() const } void SAL_CALL ChartDocumentWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -1082,7 +1029,6 @@ void SAL_CALL ChartDocumentWrapper::addEventListener( const Reference< lang::XEv } void SAL_CALL ChartDocumentWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { Reference< frame::XModel > xModel( m_spChart2ModelContact->getChartModel() ); if( xModel.is() ) @@ -1091,13 +1037,11 @@ void SAL_CALL ChartDocumentWrapper::removeEventListener( const Reference< lang:: // ____ XDrawPageSupplier ____ uno::Reference< drawing::XDrawPage > SAL_CALL ChartDocumentWrapper::getDrawPage() - throw (uno::RuntimeException, std::exception) { return this->impl_getDrawPage(); } uno::Reference< drawing::XDrawPage > ChartDocumentWrapper::impl_getDrawPage() const - throw (uno::RuntimeException) { return m_spChart2ModelContact->getDrawPage(); } @@ -1123,8 +1067,6 @@ uno::Reference< lang::XMultiServiceFactory > getShapeFactory(const uno::Referenc // ____ XMultiServiceFactory ____ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance( const OUString& aServiceSpecifier ) - throw (uno::Exception, - uno::RuntimeException, std::exception) { uno::Reference< uno::XInterface > xResult; @@ -1411,8 +1353,6 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstance( uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstanceWithArguments( const OUString& ServiceSpecifier, const uno::Sequence< uno::Any >& Arguments ) - throw (uno::Exception, - uno::RuntimeException, std::exception) { OSL_ENSURE( Arguments.getLength(), "createInstanceWithArguments: Warning: Arguments are ignored" ); (void)(Arguments); @@ -1421,7 +1361,6 @@ uno::Reference< uno::XInterface > SAL_CALL ChartDocumentWrapper::createInstanceW } uno::Sequence< OUString > SAL_CALL ChartDocumentWrapper::getAvailableServiceNames() - throw (uno::RuntimeException, std::exception) { return comphelper::mapKeysToSequence( lcl_getStaticServiceNameMap() ); } @@ -1429,7 +1368,6 @@ uno::Sequence< OUString > SAL_CALL ChartDocumentWrapper::getAvailableServiceName // ____ XAggregation ____ void SAL_CALL ChartDocumentWrapper::setDelegator( const uno::Reference< uno::XInterface >& rDelegator ) - throw (uno::RuntimeException, std::exception) { if( m_bIsDisposed ) { @@ -1460,7 +1398,6 @@ void SAL_CALL ChartDocumentWrapper::setDelegator( } uno::Any SAL_CALL ChartDocumentWrapper::queryAggregation( const uno::Type& rType ) - throw (uno::RuntimeException, std::exception) { return ChartDocumentWrapper_Base::queryInterface( rType ); } @@ -1516,19 +1453,16 @@ const std::vector< WrappedProperty* > ChartDocumentWrapper::createWrappedPropert } OUString SAL_CALL ChartDocumentWrapper::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString(CHART_CHARTAPIWRAPPER_IMPLEMENTATION_NAME); } sal_Bool SAL_CALL ChartDocumentWrapper::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL ChartDocumentWrapper::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart.ChartDocument", diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx index a480d30057df..f83bc35c5cc8 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.cxx @@ -259,14 +259,11 @@ class WrappedAttachedAxisProperty : public ::chart::WrappedProperty public: explicit WrappedAttachedAxisProperty(const std::shared_ptr& spChart2ModelContact); - virtual void setPropertyValue( const Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; protected: std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -280,7 +277,6 @@ WrappedAttachedAxisProperty::WrappedAttachedAxisProperty( } Any WrappedAttachedAxisProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= css::chart::ChartAxisAssign::PRIMARY_Y; @@ -288,7 +284,6 @@ Any WrappedAttachedAxisProperty::getPropertyDefault( const Reference< beans::XPr } Any WrappedAttachedAxisProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; @@ -302,7 +297,6 @@ Any WrappedAttachedAxisProperty::getPropertyValue( const Reference< beans::XProp } void WrappedAttachedAxisProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { uno::Reference< chart2::XDataSeries > xDataSeries( xInnerPropertySet, uno::UNO_QUERY ); @@ -364,14 +358,11 @@ class WrappedLineColorProperty : public WrappedSeriesAreaOrLineProperty public: explicit WrappedLineColorProperty( DataSeriesPointWrapper* pDataSeriesPointWrapper ); - virtual void setPropertyValue( const Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override; + virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; protected: DataSeriesPointWrapper* m_pDataSeriesPointWrapper; @@ -389,7 +380,6 @@ WrappedLineColorProperty::WrappedLineColorProperty( } void WrappedLineColorProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { if( m_pDataSeriesPointWrapper && m_pDataSeriesPointWrapper->isLinesForbidden() ) m_aOuterValue = rOuterValue; @@ -398,7 +388,6 @@ void WrappedLineColorProperty::setPropertyValue( const Any& rOuterValue, const R } void WrappedLineColorProperty::setPropertyToDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) { if( m_pDataSeriesPointWrapper && m_pDataSeriesPointWrapper->isLinesForbidden() ) m_aOuterValue = m_aDefaultValue; @@ -407,7 +396,6 @@ void WrappedLineColorProperty::setPropertyToDefault( const Reference< beans::XPr } Any WrappedLineColorProperty::getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { if( m_pDataSeriesPointWrapper && !m_pDataSeriesPointWrapper->isSupportingAreaProperties() ) return m_aDefaultValue; @@ -420,11 +408,9 @@ class WrappedLineStyleProperty : public WrappedSeriesAreaOrLineProperty public: explicit WrappedLineStyleProperty( DataSeriesPointWrapper* pDataSeriesPointWrapper ); - virtual void setPropertyValue( const Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override; + virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; protected: DataSeriesPointWrapper* m_pDataSeriesPointWrapper; @@ -442,7 +428,6 @@ WrappedLineStyleProperty::WrappedLineStyleProperty( } void WrappedLineStyleProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { Any aNewValue(rOuterValue); if( m_pDataSeriesPointWrapper && m_pDataSeriesPointWrapper->isLinesForbidden() ) @@ -454,7 +439,6 @@ void WrappedLineStyleProperty::setPropertyValue( const Any& rOuterValue, const R } void WrappedLineStyleProperty::setPropertyToDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) { if( m_pDataSeriesPointWrapper && m_pDataSeriesPointWrapper->isLinesForbidden() ) m_aOuterValue = m_aDefaultValue; @@ -482,7 +466,6 @@ DataSeriesPointWrapper::DataSeriesPointWrapper(const std::shared_ptr& aArguments ) - throw ( uno::Exception, uno::RuntimeException, std::exception) { OSL_PRECOND(aArguments.getLength() >= 1,"need at least 1 argument to initialize the DataSeriesPointWrapper: series reference + optional datapoint index"); @@ -527,7 +510,6 @@ DataSeriesPointWrapper::~DataSeriesPointWrapper() // ____ XComponent ____ void SAL_CALL DataSeriesPointWrapper::dispose() - throw (uno::RuntimeException, std::exception) { uno::Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -538,21 +520,18 @@ void SAL_CALL DataSeriesPointWrapper::dispose() void SAL_CALL DataSeriesPointWrapper::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL DataSeriesPointWrapper::removeEventListener( const uno::Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } // ____ XEventListener ____ void SAL_CALL DataSeriesPointWrapper::disposing( const lang::EventObject& /*Source*/ ) - throw (uno::RuntimeException, std::exception) { } @@ -623,7 +602,6 @@ awt::Size DataSeriesPointWrapper::getCurrentSizeForReference() //XPropertyState beans::PropertyState SAL_CALL DataSeriesPointWrapper::getPropertyState( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { beans::PropertyState aState( beans::PropertyState_DIRECT_VALUE ); try @@ -688,7 +666,6 @@ beans::PropertyState SAL_CALL DataSeriesPointWrapper::getPropertyState( const OU } void SAL_CALL DataSeriesPointWrapper::setPropertyToDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { if( m_eType == DATA_SERIES ) WrappedPropertySet::setPropertyToDefault( rPropertyName ); @@ -699,7 +676,6 @@ void SAL_CALL DataSeriesPointWrapper::setPropertyToDefault( const OUString& rPro } } Any SAL_CALL DataSeriesPointWrapper::getPropertyDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Any aRet; try @@ -800,7 +776,6 @@ const std::vector< WrappedProperty* > DataSeriesPointWrapper::createWrappedPrope } void SAL_CALL DataSeriesPointWrapper::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { if(rPropertyName == "Lines") { @@ -861,7 +836,6 @@ void SAL_CALL DataSeriesPointWrapper::setPropertyValue( const OUString& rPropert } Any SAL_CALL DataSeriesPointWrapper::getPropertyValue( const OUString& rPropertyName ) - throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { if( m_eType == DATA_POINT ) { @@ -890,19 +864,16 @@ Any SAL_CALL DataSeriesPointWrapper::getPropertyValue( const OUString& rProperty } OUString SAL_CALL DataSeriesPointWrapper::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.DataSeries"); } sal_Bool SAL_CALL DataSeriesPointWrapper::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL DataSeriesPointWrapper::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart.ChartDataRowProperties", diff --git a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx index c2bcf4ea3cdc..6f3120b40502 100644 --- a/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/DataSeriesPointWrapper.hxx @@ -73,16 +73,12 @@ public: bool isLinesForbidden() { return !m_bLinesAllowed;} /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // ___lang::XInitialization___ - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; //ReferenceSizePropertyProvider virtual void updateReferenceSize() override; @@ -91,28 +87,24 @@ public: protected: // ____ XComponent ____ - virtual void SAL_CALL dispose() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; // ____ XEventListener ____ - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; protected: // ____ WrappedPropertySet ____ virtual const css::uno::Sequence< css::beans::Property >& getPropertySequence() override; virtual const std::vector< WrappedProperty* > createWrappedProperties() override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; virtual css::uno::Reference< css::beans::XPropertySet > getInnerPropertySet() override; - virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override; //own methods css::uno::Reference< css::chart2::XDataSeries > getDataSeries(); diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index 2d33bf349f8e..ffb4fd92f2ff 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -635,7 +635,6 @@ DiagramWrapper::~DiagramWrapper() // ____ XDiagram ____ OUString SAL_CALL DiagramWrapper::getDiagramType() - throw (uno::RuntimeException, std::exception) { OUString aRet; @@ -682,8 +681,6 @@ OUString SAL_CALL DiagramWrapper::getDiagramType() Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getDataRowProperties( sal_Int32 nRow ) - throw (lang::IndexOutOfBoundsException, - uno::RuntimeException, std::exception) { if( nRow < 0 ) throw lang::IndexOutOfBoundsException("DataSeries index invalid", @@ -703,8 +700,6 @@ Reference< Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getDataPointProperties( sal_Int32 nCol, sal_Int32 nRow ) - throw (lang::IndexOutOfBoundsException, - uno::RuntimeException, std::exception) { if( nCol < 0 || nRow < 0 ) throw lang::IndexOutOfBoundsException("DataSeries index invalid", @@ -727,14 +722,12 @@ Reference< // ____ XShape (base of XDiagram) ____ awt::Point SAL_CALL DiagramWrapper::getPosition() - throw (uno::RuntimeException, std::exception) { awt::Point aPosition = ToPoint( m_spChart2ModelContact->GetDiagramRectangleIncludingAxes() ); return aPosition; } void SAL_CALL DiagramWrapper::setPosition( const awt::Point& aPosition ) - throw (uno::RuntimeException, std::exception) { ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() ); Reference< beans::XPropertySet > xProp( this->getInnerPropertySet() ); @@ -759,15 +752,12 @@ void SAL_CALL DiagramWrapper::setPosition( const awt::Point& aPosition ) } awt::Size SAL_CALL DiagramWrapper::getSize() - throw (uno::RuntimeException, std::exception) { awt::Size aSize = ToSize( m_spChart2ModelContact->GetDiagramRectangleIncludingAxes() ); return aSize; } void SAL_CALL DiagramWrapper::setSize( const awt::Size& aSize ) - throw (beans::PropertyVetoException, - uno::RuntimeException, std::exception) { ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() ); Reference< beans::XPropertySet > xProp( this->getInnerPropertySet() ); @@ -794,14 +784,13 @@ void SAL_CALL DiagramWrapper::setSize( const awt::Size& aSize ) // ____ XShapeDescriptor (base of XShape) ____ OUString SAL_CALL DiagramWrapper::getShapeType() - throw (uno::RuntimeException, std::exception) { return OUString( "com.sun.star.chart.Diagram" ); } // ____ XDiagramPositioning ____ -void SAL_CALL DiagramWrapper::setAutomaticDiagramPositioning() throw (uno::RuntimeException, std::exception) +void SAL_CALL DiagramWrapper::setAutomaticDiagramPositioning() { ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() ); uno::Reference< beans::XPropertySet > xDiaProps( this->getDiagram(), uno::UNO_QUERY ); @@ -811,7 +800,7 @@ void SAL_CALL DiagramWrapper::setAutomaticDiagramPositioning() throw (uno::Runti xDiaProps->setPropertyValue( "RelativePosition", Any() ); } } -sal_Bool SAL_CALL DiagramWrapper::isAutomaticDiagramPositioning( ) throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL DiagramWrapper::isAutomaticDiagramPositioning( ) { uno::Reference< beans::XPropertySet > xDiaProps( this->getDiagram(), uno::UNO_QUERY ); if( xDiaProps.is() ) @@ -823,7 +812,7 @@ sal_Bool SAL_CALL DiagramWrapper::isAutomaticDiagramPositioning( ) throw (uno:: } return true; } -void SAL_CALL DiagramWrapper::setDiagramPositionExcludingAxes( const awt::Rectangle& rPositionRect ) throw (uno::RuntimeException, std::exception) +void SAL_CALL DiagramWrapper::setDiagramPositionExcludingAxes( const awt::Rectangle& rPositionRect ) { ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() ); DiagramHelper::setDiagramPositioning( m_spChart2ModelContact->getChartModel(), rPositionRect ); @@ -831,7 +820,7 @@ void SAL_CALL DiagramWrapper::setDiagramPositionExcludingAxes( const awt::Rectan if( xDiaProps.is() ) xDiaProps->setPropertyValue("PosSizeExcludeAxes", uno::makeAny(true) ); } -sal_Bool SAL_CALL DiagramWrapper::isExcludingDiagramPositioning() throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL DiagramWrapper::isExcludingDiagramPositioning() { uno::Reference< beans::XPropertySet > xDiaProps( this->getDiagram(), uno::UNO_QUERY ); if( xDiaProps.is() ) @@ -847,11 +836,11 @@ sal_Bool SAL_CALL DiagramWrapper::isExcludingDiagramPositioning() throw (uno::Ru } return false; } -awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionExcludingAxes( ) throw (uno::RuntimeException, std::exception) +awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionExcludingAxes( ) { return m_spChart2ModelContact->GetDiagramRectangleExcludingAxes(); } -void SAL_CALL DiagramWrapper::setDiagramPositionIncludingAxes( const awt::Rectangle& rPositionRect ) throw (uno::RuntimeException, std::exception) +void SAL_CALL DiagramWrapper::setDiagramPositionIncludingAxes( const awt::Rectangle& rPositionRect ) { ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() ); DiagramHelper::setDiagramPositioning( m_spChart2ModelContact->getChartModel(), rPositionRect ); @@ -859,24 +848,23 @@ void SAL_CALL DiagramWrapper::setDiagramPositionIncludingAxes( const awt::Rectan if( xDiaProps.is() ) xDiaProps->setPropertyValue("PosSizeExcludeAxes", uno::makeAny(false) ); } -awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionIncludingAxes( ) throw (uno::RuntimeException, std::exception) +awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionIncludingAxes( ) { return m_spChart2ModelContact->GetDiagramRectangleIncludingAxes(); } -void SAL_CALL DiagramWrapper::setDiagramPositionIncludingAxesAndAxisTitles( const awt::Rectangle& rPositionRect ) throw (uno::RuntimeException, std::exception) +void SAL_CALL DiagramWrapper::setDiagramPositionIncludingAxesAndAxisTitles( const awt::Rectangle& rPositionRect ) { ControllerLockGuardUNO aCtrlLockGuard( m_spChart2ModelContact->getChartModel() ); awt::Rectangle aRect( m_spChart2ModelContact->SubstractAxisTitleSizes(rPositionRect) ); DiagramWrapper::setDiagramPositionIncludingAxes( aRect ); } -css::awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionIncludingAxesAndAxisTitles( ) throw (css::uno::RuntimeException, std::exception) +css::awt::Rectangle SAL_CALL DiagramWrapper::calculateDiagramPositionIncludingAxesAndAxisTitles( ) { return m_spChart2ModelContact->GetDiagramRectangleIncludingTitle(); } // ____ XAxisSupplier ____ Reference< XAxis > SAL_CALL DiagramWrapper::getAxis( sal_Int32 nDimensionIndex ) - throw (uno::RuntimeException, std::exception) { Reference< XAxis > xAxis; if(!nDimensionIndex) @@ -901,7 +889,6 @@ Reference< XAxis > SAL_CALL DiagramWrapper::getAxis( sal_Int32 nDimensionIndex ) } Reference< XAxis > SAL_CALL DiagramWrapper::getSecondaryAxis( sal_Int32 nDimensionIndex ) - throw (uno::RuntimeException, std::exception) { Reference< XAxis > xAxis; if(!nDimensionIndex) @@ -921,7 +908,6 @@ Reference< XAxis > SAL_CALL DiagramWrapper::getSecondaryAxis( sal_Int32 nDimensi // ____ XAxisZSupplier ____ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getZAxisTitle() - throw (uno::RuntimeException, std::exception) { Reference< drawing::XShape > xRet; Reference< XAxis > xAxis( getAxis(2) ); @@ -931,7 +917,6 @@ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getZAxisTitle() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZMainGrid() - throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xRet; Reference< XAxis > xAxis( getAxis(2) ); @@ -941,7 +926,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZMainGrid() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZHelpGrid() - throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xRet; Reference< XAxis > xAxis( getAxis(2) ); @@ -951,7 +935,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZHelpGrid() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZAxis() - throw (uno::RuntimeException, std::exception) { if( ! m_xZAxis.is()) m_xZAxis = new AxisWrapper( AxisWrapper::Z_AXIS, m_spChart2ModelContact ); @@ -960,7 +943,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getZAxis() // ____ XTwoAxisXSupplier ____ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getSecondaryXAxis() - throw (uno::RuntimeException, std::exception) { if( ! m_xSecondXAxis.is()) m_xSecondXAxis = new AxisWrapper( AxisWrapper::SECOND_X_AXIS, m_spChart2ModelContact ); @@ -969,7 +951,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getSecondaryXAxis() // ____ XAxisXSupplier (base of XTwoAxisXSupplier) ____ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getXAxisTitle() - throw (uno::RuntimeException, std::exception) { Reference< drawing::XShape > xRet; Reference< XAxis > xAxis( getAxis(0) ); @@ -979,7 +960,6 @@ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getXAxisTitle() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXAxis() - throw (uno::RuntimeException, std::exception) { if( ! m_xXAxis.is()) m_xXAxis = new AxisWrapper( AxisWrapper::X_AXIS, m_spChart2ModelContact ); @@ -987,7 +967,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXAxis() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXMainGrid() - throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xRet; Reference< XAxis > xAxis( getAxis(0) ); @@ -997,7 +976,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXMainGrid() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXHelpGrid() - throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xRet; Reference< XAxis > xAxis( getAxis(0) ); @@ -1008,7 +986,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getXHelpGrid() // ____ XTwoAxisYSupplier ____ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getSecondaryYAxis() - throw (uno::RuntimeException, std::exception) { if( ! m_xSecondYAxis.is()) m_xSecondYAxis = new AxisWrapper( AxisWrapper::SECOND_Y_AXIS, m_spChart2ModelContact ); @@ -1017,7 +994,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getSecondaryYAxis() // ____ XAxisYSupplier (base of XTwoAxisYSupplier) ____ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getYAxisTitle() - throw (uno::RuntimeException, std::exception) { Reference< drawing::XShape > xRet; Reference< XAxis > xAxis( getAxis(1) ); @@ -1027,7 +1003,6 @@ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getYAxisTitle() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYAxis() - throw (uno::RuntimeException, std::exception) { if( ! m_xYAxis.is()) m_xYAxis = new AxisWrapper( AxisWrapper::Y_AXIS, m_spChart2ModelContact ); @@ -1035,7 +1010,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYAxis() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYMainGrid() - throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xRet; Reference< XAxis > xAxis( getAxis(1) ); @@ -1045,7 +1019,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYMainGrid() } Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYHelpGrid() - throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xRet; Reference< XAxis > xAxis( getAxis(1) ); @@ -1056,7 +1029,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getYHelpGrid() // ____ XSecondAxisTitleSupplier ____ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getSecondXAxisTitle() - throw (uno::RuntimeException, std::exception) { Reference< drawing::XShape > xRet; Reference< XAxis > xAxis( getSecondaryAxis(0) ); @@ -1066,7 +1038,6 @@ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getSecondXAxisTitle() } Reference< drawing::XShape > SAL_CALL DiagramWrapper::getSecondYAxisTitle() - throw (uno::RuntimeException, std::exception) { Reference< drawing::XShape > xRet; Reference< XAxis > xAxis( getSecondaryAxis(1) ); @@ -1078,7 +1049,6 @@ Reference< drawing::XShape > SAL_CALL DiagramWrapper::getSecondYAxisTitle() // ____ XStatisticDisplay ____ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getUpBar() - throw (uno::RuntimeException, std::exception) { if( !m_xUpBarWrapper.is() ) { @@ -1089,7 +1059,6 @@ Reference< Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getDownBar() - throw (uno::RuntimeException, std::exception) { if( !m_xDownBarWrapper.is() ) { @@ -1100,7 +1069,6 @@ Reference< Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getMinMaxLine() - throw (uno::RuntimeException, std::exception) { if( !m_xMinMaxLineWrapper.is() ) { @@ -1111,7 +1079,6 @@ Reference< // ____ X3DDisplay ____ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getWall() - throw (uno::RuntimeException, std::exception) { if( !m_xWall.is() ) { @@ -1122,7 +1089,6 @@ Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getWall() Reference< beans::XPropertySet > SAL_CALL DiagramWrapper::getFloor() - throw (uno::RuntimeException, std::exception) { if( !m_xFloor.is() ) { @@ -1133,7 +1099,6 @@ Reference< // ____ X3DDefaultSetter ____ void SAL_CALL DiagramWrapper::set3DSettingsToDefault() - throw (uno::RuntimeException, std::exception) { Reference< X3DDefaultSetter > x3DDefaultSetter( m_spChart2ModelContact->getChart2Diagram(), uno::UNO_QUERY ); if( x3DDefaultSetter.is() ) @@ -1141,7 +1106,6 @@ void SAL_CALL DiagramWrapper::set3DSettingsToDefault() } void SAL_CALL DiagramWrapper::setDefaultRotation() - throw (uno::RuntimeException, std::exception) { Reference< X3DDefaultSetter > x3DDefaultSetter( m_spChart2ModelContact->getChart2Diagram(), uno::UNO_QUERY ); if( x3DDefaultSetter.is() ) @@ -1149,7 +1113,6 @@ void SAL_CALL DiagramWrapper::setDefaultRotation() } void SAL_CALL DiagramWrapper::setDefaultIllumination() - throw (uno::RuntimeException, std::exception) { Reference< X3DDefaultSetter > x3DDefaultSetter( m_spChart2ModelContact->getChart2Diagram(), uno::UNO_QUERY ); if( x3DDefaultSetter.is() ) @@ -1158,7 +1121,6 @@ void SAL_CALL DiagramWrapper::setDefaultIllumination() // ____ XComponent ____ void SAL_CALL DiagramWrapper::dispose() - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.disposeAndClear( lang::EventObject( static_cast< ::cppu::OWeakObject* >( this ))); @@ -1180,14 +1142,12 @@ void SAL_CALL DiagramWrapper::dispose() void SAL_CALL DiagramWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL DiagramWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } @@ -1198,14 +1158,11 @@ class WrappedDataRowSourceProperty : public WrappedProperty public: explicit WrappedDataRowSourceProperty(const std::shared_ptr& spChart2ModelContact); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -1221,7 +1178,6 @@ WrappedDataRowSourceProperty::WrappedDataRowSourceProperty(const std::shared_ptr } void WrappedDataRowSourceProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { css::chart::ChartDataRowSource eChartDataRowSource = css::chart::ChartDataRowSource_ROWS; if( ! (rOuterValue >>= eChartDataRowSource) ) @@ -1257,7 +1213,6 @@ void WrappedDataRowSourceProperty::setPropertyValue( const Any& rOuterValue, con } Any WrappedDataRowSourceProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { OUString aRangeString; bool bUseColumns = true; @@ -1280,7 +1235,6 @@ Any WrappedDataRowSourceProperty::getPropertyValue( const Reference< beans::XPro } Any WrappedDataRowSourceProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= css::chart::ChartDataRowSource_COLUMNS; @@ -1295,14 +1249,11 @@ class WrappedStackingProperty : public WrappedProperty public: WrappedStackingProperty(StackMode eStackMode, const std::shared_ptr& spChart2ModelContact); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; protected: //methods bool detectInnerValue( StackMode& eInnerStackMode ) const; @@ -1346,7 +1297,6 @@ bool WrappedStackingProperty::detectInnerValue( StackMode& eStackMode ) const } void WrappedStackingProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { bool bNewValue = false; if( ! (rOuterValue >>= bNewValue) ) @@ -1375,7 +1325,6 @@ void WrappedStackingProperty::setPropertyValue( const Any& rOuterValue, const Re } Any WrappedStackingProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { StackMode eInnerStackMode; if( detectInnerValue( eInnerStackMode ) ) @@ -1387,7 +1336,6 @@ Any WrappedStackingProperty::getPropertyValue( const Reference< beans::XProperty } Any WrappedStackingProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= false; @@ -1400,14 +1348,11 @@ class WrappedDim3DProperty : public WrappedProperty public: explicit WrappedDim3DProperty(const std::shared_ptr& spChart2ModelContact); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -1423,7 +1368,6 @@ WrappedDim3DProperty::WrappedDim3DProperty(const std::shared_ptr& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { bool bNew3D = false; if( ! (rOuterValue >>= bNew3D) ) @@ -1441,7 +1385,6 @@ void WrappedDim3DProperty::setPropertyValue( const Any& rOuterValue, const Refer } Any WrappedDim3DProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() ); if( xDiagram.is() ) @@ -1453,7 +1396,6 @@ Any WrappedDim3DProperty::getPropertyValue( const Reference< beans::XPropertySet } Any WrappedDim3DProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= false; @@ -1466,14 +1408,11 @@ class WrappedVerticalProperty : public WrappedProperty public: explicit WrappedVerticalProperty(const std::shared_ptr& spChart2ModelContact); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -1489,7 +1428,6 @@ WrappedVerticalProperty::WrappedVerticalProperty(const std::shared_ptr& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { bool bNewVertical = false; if( ! (rOuterValue >>= bNewVertical) ) @@ -1509,7 +1447,6 @@ void WrappedVerticalProperty::setPropertyValue( const Any& rOuterValue, const Re } Any WrappedVerticalProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() ); if( xDiagram.is() ) @@ -1524,7 +1461,6 @@ Any WrappedVerticalProperty::getPropertyValue( const Reference< beans::XProperty } Any WrappedVerticalProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= false; @@ -1537,14 +1473,11 @@ class WrappedNumberOfLinesProperty : public WrappedProperty public: explicit WrappedNumberOfLinesProperty(const std::shared_ptr& spChart2ModelContact); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; protected: //methods bool detectInnerValue( uno::Any& rInnerValue ) const; @@ -1597,7 +1530,6 @@ bool WrappedNumberOfLinesProperty::detectInnerValue( uno::Any& rInnerValue ) con } void WrappedNumberOfLinesProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { sal_Int32 nNewValue; if( ! (rOuterValue >>= nNewValue) ) @@ -1664,7 +1596,6 @@ void WrappedNumberOfLinesProperty::setPropertyValue( const Any& rOuterValue, con } Any WrappedNumberOfLinesProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; if( !detectInnerValue( aRet ) ) @@ -1673,7 +1604,6 @@ Any WrappedNumberOfLinesProperty::getPropertyValue( const Reference< beans::XPro } Any WrappedNumberOfLinesProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= sal_Int32( 0 ); @@ -1686,14 +1616,11 @@ class WrappedAttributedDataPointsProperty : public WrappedProperty public: explicit WrappedAttributedDataPointsProperty(const std::shared_ptr& spChart2ModelContact); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -1709,7 +1636,6 @@ WrappedAttributedDataPointsProperty::WrappedAttributedDataPointsProperty(const s } void WrappedAttributedDataPointsProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { uno::Sequence< uno::Sequence< sal_Int32 > > aNewValue; if( ! (rOuterValue >>= aNewValue) ) @@ -1748,7 +1674,6 @@ void WrappedAttributedDataPointsProperty::setPropertyValue( const Any& rOuterVal } Any WrappedAttributedDataPointsProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() ); Reference< beans::XPropertySet > xDiaProp( xDiagram, uno::UNO_QUERY ); @@ -1781,7 +1706,6 @@ Any WrappedAttributedDataPointsProperty::getPropertyValue( const Reference< bean } Any WrappedAttributedDataPointsProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; uno::Sequence< uno::Sequence< sal_Int32 > > aSeq; @@ -1795,14 +1719,11 @@ class WrappedSolidTypeProperty : public WrappedProperty public: explicit WrappedSolidTypeProperty(const std::shared_ptr& spChart2ModelContact); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -1818,7 +1739,6 @@ WrappedSolidTypeProperty::WrappedSolidTypeProperty(const std::shared_ptr& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { sal_Int32 nNewSolidType = css::chart::ChartSolidType::RECTANGULAR_SOLID; if( ! (rOuterValue >>= nNewSolidType) ) @@ -1838,7 +1758,6 @@ void WrappedSolidTypeProperty::setPropertyValue( const Any& rOuterValue, const R } Any WrappedSolidTypeProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() ); if( xDiagram.is() ) @@ -1853,7 +1772,6 @@ Any WrappedSolidTypeProperty::getPropertyValue( const Reference< beans::XPropert } Any WrappedSolidTypeProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return uno::makeAny( css::chart::ChartSolidType::RECTANGULAR_SOLID ); } @@ -1863,14 +1781,11 @@ class WrappedAutomaticSizeProperty : public WrappedProperty public: WrappedAutomaticSizeProperty(); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; }; WrappedAutomaticSizeProperty::WrappedAutomaticSizeProperty() @@ -1879,7 +1794,6 @@ WrappedAutomaticSizeProperty::WrappedAutomaticSizeProperty() } void WrappedAutomaticSizeProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { if( xInnerPropertySet.is() ) { @@ -1904,7 +1818,6 @@ void WrappedAutomaticSizeProperty::setPropertyValue( const Any& rOuterValue, con } Any WrappedAutomaticSizeProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet( getPropertyDefault( Reference< beans::XPropertyState >( xInnerPropertySet, uno::UNO_QUERY ) ) ); if( xInnerPropertySet.is() ) @@ -1917,7 +1830,6 @@ Any WrappedAutomaticSizeProperty::getPropertyValue( const Reference< beans::XPro } Any WrappedAutomaticSizeProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= false; @@ -1930,10 +1842,8 @@ class WrappedIncludeHiddenCellsProperty : public WrappedProperty public: explicit WrappedIncludeHiddenCellsProperty(const std::shared_ptr& spChart2ModelContact); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; - virtual Any getPropertyValue(const Reference& xInnerPropertySet) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; + virtual Any getPropertyValue(const Reference& xInnerPropertySet) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -1946,7 +1856,6 @@ WrappedIncludeHiddenCellsProperty::WrappedIncludeHiddenCellsProperty(const std:: } void WrappedIncludeHiddenCellsProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { bool bNewValue = false; if( ! (rOuterValue >>= bNewValue) ) @@ -1956,7 +1865,6 @@ void WrappedIncludeHiddenCellsProperty::setPropertyValue( const Any& rOuterValue } Any WrappedIncludeHiddenCellsProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { bool bValue = ChartModelHelper::isIncludeHiddenCells( m_spChart2ModelContact->getChartModel() ); return uno::Any(bValue); @@ -1964,14 +1872,12 @@ Any WrappedIncludeHiddenCellsProperty::getPropertyValue( const Reference< beans: // ____ XDiagramProvider ____ Reference< chart2::XDiagram > SAL_CALL DiagramWrapper::getDiagram() - throw (uno::RuntimeException, std::exception) { return m_spChart2ModelContact->getChart2Diagram(); } void SAL_CALL DiagramWrapper::setDiagram( const Reference< chart2::XDiagram >& /*xDiagram*/ ) - throw (uno::RuntimeException, std::exception) { //@todo: remove this method from interface OSL_FAIL("DiagramWrapper::setDiagram is not implemented, should be removed and not be called" ); @@ -2022,19 +1928,16 @@ const std::vector< WrappedProperty* > DiagramWrapper::createWrappedProperties() } OUString SAL_CALL DiagramWrapper::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.Diagram"); } sal_Bool SAL_CALL DiagramWrapper::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL DiagramWrapper::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart.Diagram", diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx index 24649f66bc0b..148e4705eb08 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.hxx @@ -75,158 +75,116 @@ public: virtual ~DiagramWrapper() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // ____ XComponent ____ - virtual void SAL_CALL dispose() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; virtual void SAL_CALL addEventListener( const css::uno::Reference< - css::lang::XEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + css::lang::XEventListener >& xListener ) override; virtual void SAL_CALL removeEventListener( const css::uno::Reference< - css::lang::XEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + css::lang::XEventListener >& aListener ) override; // ____ XDiagram ____ - virtual OUString SAL_CALL getDiagramType() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getDiagramType() override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getDataRowProperties( sal_Int32 nRow ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getDataRowProperties( sal_Int32 nRow ) override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getDataPointProperties( sal_Int32 nCol, sal_Int32 nRow ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getDataPointProperties( sal_Int32 nCol, sal_Int32 nRow ) override; // ____ XShape (base of XDiagram) ____ - virtual css::awt::Point SAL_CALL getPosition() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Size SAL_CALL getSize() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSize( const css::awt::Size& aSize ) - throw (css::beans::PropertyVetoException, - css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getPosition() override; + virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override; + virtual css::awt::Size SAL_CALL getSize() override; + virtual void SAL_CALL setSize( const css::awt::Size& aSize ) override; // ____ XShapeDescriptor (base of XShape) ____ - virtual OUString SAL_CALL getShapeType() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getShapeType() override; // ____ XAxisSupplier ____ virtual css::uno::Reference< - css::chart::XAxis > SAL_CALL getAxis( sal_Int32 nDimensionIndex ) - throw (css::uno::RuntimeException, std::exception) override; + css::chart::XAxis > SAL_CALL getAxis( sal_Int32 nDimensionIndex ) override; virtual css::uno::Reference< - css::chart::XAxis > SAL_CALL getSecondaryAxis( sal_Int32 nDimensionIndex ) - throw (css::uno::RuntimeException, std::exception) override; + css::chart::XAxis > SAL_CALL getSecondaryAxis( sal_Int32 nDimensionIndex ) override; // ____ XAxisZSupplier ____ virtual css::uno::Reference< - css::drawing::XShape > SAL_CALL getZAxisTitle() - throw (css::uno::RuntimeException, std::exception) override; + css::drawing::XShape > SAL_CALL getZAxisTitle() override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getZMainGrid() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getZMainGrid() override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getZHelpGrid() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getZHelpGrid() override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getZAxis() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getZAxis() override; // ____ XTwoAxisXSupplier ____ virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getSecondaryXAxis() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getSecondaryXAxis() override; // ____ XAxisXSupplier (base of XTwoAxisXSupplier) ____ virtual css::uno::Reference< - css::drawing::XShape > SAL_CALL getXAxisTitle() - throw (css::uno::RuntimeException, std::exception) override; + css::drawing::XShape > SAL_CALL getXAxisTitle() override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getXAxis() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getXAxis() override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getXMainGrid() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getXMainGrid() override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getXHelpGrid() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getXHelpGrid() override; // ____ XTwoAxisYSupplier ____ virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getSecondaryYAxis() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getSecondaryYAxis() override; // ____ XAxisYSupplier (base of XTwoAxisYSupplier) ____ virtual css::uno::Reference< - css::drawing::XShape > SAL_CALL getYAxisTitle() - throw (css::uno::RuntimeException, std::exception) override; + css::drawing::XShape > SAL_CALL getYAxisTitle() override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getYAxis() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getYAxis() override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getYHelpGrid() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getYHelpGrid() override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getYMainGrid() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getYMainGrid() override; // ____ XSecondAxisTitleSupplier ____ virtual css::uno::Reference< - css::drawing::XShape > SAL_CALL getSecondXAxisTitle() - throw (css::uno::RuntimeException, std::exception) override; + css::drawing::XShape > SAL_CALL getSecondXAxisTitle() override; virtual css::uno::Reference< - css::drawing::XShape > SAL_CALL getSecondYAxisTitle() - throw (css::uno::RuntimeException, std::exception) override; + css::drawing::XShape > SAL_CALL getSecondYAxisTitle() override; // ____ XStatisticDisplay ____ virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getUpBar() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getUpBar() override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getDownBar() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getDownBar() override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getMinMaxLine() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getMinMaxLine() override; // ____ X3DDisplay ____ virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getWall() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getWall() override; virtual css::uno::Reference< - css::beans::XPropertySet > SAL_CALL getFloor() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::XPropertySet > SAL_CALL getFloor() override; // ____ X3DDefaultSetter ____ - virtual void SAL_CALL set3DSettingsToDefault() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDefaultRotation() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDefaultIllumination() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL set3DSettingsToDefault() override; + virtual void SAL_CALL setDefaultRotation() override; + virtual void SAL_CALL setDefaultIllumination() override; // ____ XDiagramPositioning ____ - virtual void SAL_CALL setAutomaticDiagramPositioning( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAutomaticDiagramPositioning( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDiagramPositionExcludingAxes( const css::awt::Rectangle& PositionRect ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isExcludingDiagramPositioning( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Rectangle SAL_CALL calculateDiagramPositionExcludingAxes( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDiagramPositionIncludingAxes( const css::awt::Rectangle& PositionRect ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Rectangle SAL_CALL calculateDiagramPositionIncludingAxes( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDiagramPositionIncludingAxesAndAxisTitles( const css::awt::Rectangle& PositionRect ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Rectangle SAL_CALL calculateDiagramPositionIncludingAxesAndAxisTitles( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setAutomaticDiagramPositioning( ) override; + virtual sal_Bool SAL_CALL isAutomaticDiagramPositioning( ) override; + virtual void SAL_CALL setDiagramPositionExcludingAxes( const css::awt::Rectangle& PositionRect ) override; + virtual sal_Bool SAL_CALL isExcludingDiagramPositioning( ) override; + virtual css::awt::Rectangle SAL_CALL calculateDiagramPositionExcludingAxes( ) override; + virtual void SAL_CALL setDiagramPositionIncludingAxes( const css::awt::Rectangle& PositionRect ) override; + virtual css::awt::Rectangle SAL_CALL calculateDiagramPositionIncludingAxes( ) override; + virtual void SAL_CALL setDiagramPositionIncludingAxesAndAxisTitles( const css::awt::Rectangle& PositionRect ) override; + virtual css::awt::Rectangle SAL_CALL calculateDiagramPositionIncludingAxesAndAxisTitles( ) override; // ____ XDiagramProvider ____ - virtual css::uno::Reference< css::chart2::XDiagram > SAL_CALL getDiagram() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDiagram( const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::XDiagram > SAL_CALL getDiagram() override; + virtual void SAL_CALL setDiagram( const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) override; protected: // ____ WrappedPropertySet ____ diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx index a1ee70db97f0..fb2fb8d7e8e2 100644 --- a/chart2/source/controller/chartapiwrapper/GridWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/GridWrapper.cxx @@ -109,7 +109,6 @@ void GridWrapper::getDimensionAndSubGridBool( tGridType eType, sal_Int32& rnDime // ____ XComponent ____ void SAL_CALL GridWrapper::dispose() - throw (uno::RuntimeException, std::exception) { Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -119,14 +118,12 @@ void SAL_CALL GridWrapper::dispose() void SAL_CALL GridWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL GridWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } @@ -170,19 +167,16 @@ const std::vector< WrappedProperty* > GridWrapper::createWrappedProperties() } OUString SAL_CALL GridWrapper::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.Grid"); } sal_Bool SAL_CALL GridWrapper::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL GridWrapper::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart.ChartGrid", diff --git a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx index 818b5fea65b6..2e7097e8e207 100644 --- a/chart2/source/controller/chartapiwrapper/GridWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/GridWrapper.hxx @@ -61,20 +61,14 @@ public: static void getDimensionAndSubGridBool( tGridType eType, sal_Int32& rnDimensionIndex, bool& rbSubGrid ); /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // ____ XComponent ____ - virtual void SAL_CALL dispose() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; protected: // ____ WrappedPropertySet ____ diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx index 9d4f7ce0ba50..caa5bf8e1eaa 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.cxx @@ -57,10 +57,8 @@ class WrappedLegendAlignmentProperty : public WrappedProperty public: WrappedLegendAlignmentProperty(); - virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) override; - virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override; + virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const override; + virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const override; protected: virtual Any convertInnerToOuterValue( const Any& rInnerValue ) const override; @@ -73,7 +71,6 @@ WrappedLegendAlignmentProperty::WrappedLegendAlignmentProperty() } Any WrappedLegendAlignmentProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; if( xInnerPropertySet.is() ) @@ -94,7 +91,6 @@ Any WrappedLegendAlignmentProperty::getPropertyValue( const Reference< beans::XP } void WrappedLegendAlignmentProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { if(xInnerPropertySet.is()) { @@ -280,13 +276,11 @@ LegendWrapper::~LegendWrapper() // ____ XShape ____ awt::Point SAL_CALL LegendWrapper::getPosition() - throw (uno::RuntimeException, std::exception) { return m_spChart2ModelContact->GetLegendPosition(); } void SAL_CALL LegendWrapper::setPosition( const awt::Point& aPosition ) - throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xProp( this->getInnerPropertySet() ); if( xProp.is() ) @@ -302,14 +296,11 @@ void SAL_CALL LegendWrapper::setPosition( const awt::Point& aPosition ) } awt::Size SAL_CALL LegendWrapper::getSize() - throw (uno::RuntimeException, std::exception) { return m_spChart2ModelContact->GetLegendSize(); } void SAL_CALL LegendWrapper::setSize( const awt::Size& aSize ) - throw (beans::PropertyVetoException, - uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xProp( this->getInnerPropertySet() ); if( xProp.is() ) @@ -327,14 +318,12 @@ void SAL_CALL LegendWrapper::setSize( const awt::Size& aSize ) // ____ XShapeDescriptor (base of XShape) ____ OUString SAL_CALL LegendWrapper::getShapeType() - throw (uno::RuntimeException, std::exception) { return OUString( "com.sun.star.chart.ChartLegend" ); } // ____ XComponent ____ void SAL_CALL LegendWrapper::dispose() - throw (uno::RuntimeException, std::exception) { Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -345,14 +334,12 @@ void SAL_CALL LegendWrapper::dispose() void SAL_CALL LegendWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL LegendWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } @@ -415,19 +402,16 @@ const std::vector< WrappedProperty* > LegendWrapper::createWrappedProperties() } OUString SAL_CALL LegendWrapper::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.Legend"); } sal_Bool SAL_CALL LegendWrapper::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL LegendWrapper::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart.ChartLegend", diff --git a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx index 3c539c6aa779..c59bb25caddc 100644 --- a/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/LegendWrapper.hxx @@ -54,12 +54,9 @@ public: virtual ~LegendWrapper() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; //ReferenceSizePropertyProvider virtual void updateReferenceSize() override; @@ -67,29 +64,20 @@ public: virtual css::awt::Size getCurrentSizeForReference() override; // ____ XShape ____ - virtual css::awt::Point SAL_CALL getPosition() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Size SAL_CALL getSize() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSize( const css::awt::Size& aSize ) - throw (css::beans::PropertyVetoException, - css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getPosition() override; + virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override; + virtual css::awt::Size SAL_CALL getSize() override; + virtual void SAL_CALL setSize( const css::awt::Size& aSize ) override; // ____ XShapeDescriptor (base of XShape) ____ - virtual OUString SAL_CALL getShapeType() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getShapeType() override; // ____ XComponent ____ - virtual void SAL_CALL dispose() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; virtual void SAL_CALL addEventListener( const css::uno::Reference< - css::lang::XEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + css::lang::XEventListener >& xListener ) override; virtual void SAL_CALL removeEventListener( const css::uno::Reference< - css::lang::XEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + css::lang::XEventListener >& aListener ) override; protected: // ____ WrappedPropertySet ____ diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx index 4b3f28773c2d..282fcdf5469a 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.cxx @@ -130,7 +130,6 @@ MinMaxLineWrapper::~MinMaxLineWrapper() // ____ XComponent ____ void SAL_CALL MinMaxLineWrapper::dispose() - throw (uno::RuntimeException, std::exception) { Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -138,27 +137,23 @@ void SAL_CALL MinMaxLineWrapper::dispose() void SAL_CALL MinMaxLineWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL MinMaxLineWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } //XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL MinMaxLineWrapper::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticMinMaxLineWrapperInfo::get(); } void SAL_CALL MinMaxLineWrapper::setPropertyValue( const OUString& rPropertyName, const uno::Any& rValue ) - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xPropSet(nullptr); @@ -195,7 +190,6 @@ void SAL_CALL MinMaxLineWrapper::setPropertyValue( const OUString& rPropertyName } } uno::Any SAL_CALL MinMaxLineWrapper::getPropertyValue( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Any aRet; @@ -237,22 +231,18 @@ uno::Any SAL_CALL MinMaxLineWrapper::getPropertyValue( const OUString& rProperty } void SAL_CALL MinMaxLineWrapper::addPropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL MinMaxLineWrapper::removePropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL MinMaxLineWrapper::addVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL MinMaxLineWrapper::removeVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } @@ -260,7 +250,6 @@ void SAL_CALL MinMaxLineWrapper::removeVetoableChangeListener( const OUString& / //XMultiPropertySet //getPropertySetInfo() already declared in XPropertySet void SAL_CALL MinMaxLineWrapper::setPropertyValues( const uno::Sequence< OUString >& rNameSeq, const uno::Sequence< uno::Any >& rValueSeq ) - throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { sal_Int32 nMinCount = std::min( rValueSeq.getLength(), rNameSeq.getLength() ); for(sal_Int32 nN=0; nN SAL_CALL MinMaxLineWrapper::getPropertyValues( const uno::Sequence< OUString >& rNameSeq ) - throw (uno::RuntimeException, std::exception) { Sequence< Any > aRetSeq; if( rNameSeq.getLength() ) @@ -295,27 +283,23 @@ uno::Sequence< uno::Any > SAL_CALL MinMaxLineWrapper::getPropertyValues( const u void SAL_CALL MinMaxLineWrapper::addPropertiesChangeListener( const uno::Sequence< OUString >& /* aPropertyNames */, const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ ) - throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL MinMaxLineWrapper::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ ) - throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL MinMaxLineWrapper::firePropertiesChangeEvent( const uno::Sequence< OUString >& /* aPropertyNames */, const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ ) - throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } //XPropertyState beans::PropertyState SAL_CALL MinMaxLineWrapper::getPropertyState( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { if( rPropertyName.equals( m_aWrappedLineJointProperty.getOuterName() ) ) return beans::PropertyState_DEFAULT_VALUE; @@ -329,7 +313,6 @@ beans::PropertyState SAL_CALL MinMaxLineWrapper::getPropertyState( const OUStrin return beans::PropertyState_DIRECT_VALUE; } uno::Sequence< beans::PropertyState > SAL_CALL MinMaxLineWrapper::getPropertyStates( const uno::Sequence< OUString >& rNameSeq ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { Sequence< beans::PropertyState > aRetSeq; if( rNameSeq.getLength() ) @@ -344,13 +327,11 @@ uno::Sequence< beans::PropertyState > SAL_CALL MinMaxLineWrapper::getPropertySta return aRetSeq; } void SAL_CALL MinMaxLineWrapper::setPropertyToDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { this->setPropertyValue( rPropertyName, this->getPropertyDefault(rPropertyName) ); } uno::Any SAL_CALL MinMaxLineWrapper::getPropertyDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { const tPropertyValueMap& rStaticDefaults = *StaticMinMaxLineWrapperDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( StaticMinMaxLineWrapperInfoHelper::get()->getHandleByName( rPropertyName ) ) ); @@ -362,7 +343,6 @@ uno::Any SAL_CALL MinMaxLineWrapper::getPropertyDefault( const OUString& rProper //XMultiPropertyStates //getPropertyStates() already declared in XPropertyState void SAL_CALL MinMaxLineWrapper::setAllPropertiesToDefault( ) - throw (uno::RuntimeException, std::exception) { const Sequence< beans::Property >& rPropSeq = *StaticMinMaxLineWrapperPropertyArray::get(); for(sal_Int32 nN=0; nN& rNameSeq ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { for(sal_Int32 nN=0; nN SAL_CALL MinMaxLineWrapper::getPropertyDefaults( const uno::Sequence< OUString >& rNameSeq ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Sequence< Any > aRetSeq; if( rNameSeq.getLength() ) @@ -397,19 +375,16 @@ uno::Sequence< uno::Any > SAL_CALL MinMaxLineWrapper::getPropertyDefaults( const } OUString SAL_CALL MinMaxLineWrapper::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.ChartLine"); } sal_Bool SAL_CALL MinMaxLineWrapper::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL MinMaxLineWrapper::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart.ChartLine", diff --git a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx index 860e70e1923c..07687651e728 100644 --- a/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/MinMaxLineWrapper.hxx @@ -59,51 +59,45 @@ public: virtual ~MinMaxLineWrapper() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // ____ XComponent ____ - virtual void SAL_CALL dispose() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; //XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; //XMultiPropertySet //getPropertySetInfo() already declared in XPropertySet - virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) override; + virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; + virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; //XPropertyState - virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override; + virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) override; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override; //XMultiPropertyStates //getPropertyStates() already declared in XPropertyState - virtual void SAL_CALL setAllPropertiesToDefault( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setAllPropertiesToDefault( ) override; + virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx index d70606fd28dd..3cbef7fb707d 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.cxx @@ -51,12 +51,9 @@ class WrappedTitleStringProperty : public WrappedProperty public: explicit WrappedTitleStringProperty( const Reference< uno::XComponentContext >& xContext ); - virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) override; - virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override; - virtual Any getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override; + virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const override; + virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const override; + virtual Any getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const override; protected: Reference< uno::XComponentContext > m_xContext; @@ -69,7 +66,6 @@ WrappedTitleStringProperty::WrappedTitleStringProperty( const Reference< uno::XC } void WrappedTitleStringProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { Reference< chart2::XTitle > xTitle(xInnerPropertySet,uno::UNO_QUERY); if(xTitle.is()) @@ -80,7 +76,6 @@ void WrappedTitleStringProperty::setPropertyValue( const Any& rOuterValue, const } } Any WrappedTitleStringProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet( getPropertyDefault( Reference< beans::XPropertyState >( xInnerPropertySet, uno::UNO_QUERY ) ) ); Reference< chart2::XTitle > xTitle(xInnerPropertySet,uno::UNO_QUERY); @@ -98,7 +93,6 @@ Any WrappedTitleStringProperty::getPropertyValue( const Reference< beans::XPrope return aRet; } Any WrappedTitleStringProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return uno::makeAny( OUString() );//default title is a empty String } @@ -205,13 +199,11 @@ TitleWrapper::~TitleWrapper() // ____ XShape ____ awt::Point SAL_CALL TitleWrapper::getPosition() - throw (uno::RuntimeException, std::exception) { return m_spChart2ModelContact->GetTitlePosition( this->getTitleObject() ); } void SAL_CALL TitleWrapper::setPosition( const awt::Point& aPosition ) - throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xPropertySet( this->getInnerPropertySet() ); if(xPropertySet.is()) @@ -227,28 +219,23 @@ void SAL_CALL TitleWrapper::setPosition( const awt::Point& aPosition ) } awt::Size SAL_CALL TitleWrapper::getSize() - throw (uno::RuntimeException, std::exception) { return m_spChart2ModelContact->GetTitleSize( this->getTitleObject() ); } void SAL_CALL TitleWrapper::setSize( const awt::Size& /*aSize*/ ) - throw (beans::PropertyVetoException, - uno::RuntimeException, std::exception) { OSL_FAIL( "trying to set size of title" ); } // ____ XShapeDescriptor (base of XShape) ____ OUString SAL_CALL TitleWrapper::getShapeType() - throw (uno::RuntimeException, std::exception) { return OUString( "com.sun.star.chart.ChartTitle" ); } // ____ XComponent ____ void SAL_CALL TitleWrapper::dispose() - throw (uno::RuntimeException, std::exception) { Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -259,14 +246,12 @@ void SAL_CALL TitleWrapper::dispose() void SAL_CALL TitleWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL TitleWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } @@ -309,7 +294,7 @@ void TitleWrapper::getFastCharacterPropertyValue( sal_Int32 nHandle, Any& rValue } void TitleWrapper::setFastCharacterPropertyValue( - sal_Int32 nHandle, const Any& rValue ) throw (uno::Exception) + sal_Int32 nHandle, const Any& rValue ) { OSL_ASSERT( FAST_PROPERTY_ID_START_CHAR_PROP <= nHandle && nHandle < CharacterProperties::FAST_PROPERTY_ID_END_CHAR_PROP ); @@ -336,7 +321,6 @@ void TitleWrapper::setFastCharacterPropertyValue( // WrappedPropertySet void SAL_CALL TitleWrapper::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName ); if( CharacterProperties::IsCharacterPropertyHandle( nHandle ) ) @@ -348,7 +332,6 @@ void SAL_CALL TitleWrapper::setPropertyValue( const OUString& rPropertyName, con } Any SAL_CALL TitleWrapper::getPropertyValue( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Any aRet; sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName ); @@ -360,7 +343,6 @@ Any SAL_CALL TitleWrapper::getPropertyValue( const OUString& rPropertyName ) } beans::PropertyState SAL_CALL TitleWrapper::getPropertyState( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { beans::PropertyState aState( beans::PropertyState_DIRECT_VALUE ); @@ -383,7 +365,6 @@ beans::PropertyState SAL_CALL TitleWrapper::getPropertyState( const OUString& rP return aState; } void SAL_CALL TitleWrapper::setPropertyToDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName ); if( CharacterProperties::IsCharacterPropertyHandle( nHandle ) ) @@ -395,7 +376,6 @@ void SAL_CALL TitleWrapper::setPropertyToDefault( const OUString& rPropertyName WrappedPropertySet::setPropertyToDefault( rPropertyName ); } Any SAL_CALL TitleWrapper::getPropertyDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Any aRet; @@ -419,7 +399,6 @@ Any SAL_CALL TitleWrapper::getPropertyDefault( const OUString& rPropertyName ) } void SAL_CALL TitleWrapper::addPropertyChangeListener( const OUString& rPropertyName, const Reference< beans::XPropertyChangeListener >& xListener ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName ); if( CharacterProperties::IsCharacterPropertyHandle( nHandle ) ) @@ -432,7 +411,6 @@ void SAL_CALL TitleWrapper::addPropertyChangeListener( const OUString& rProperty WrappedPropertySet::addPropertyChangeListener( rPropertyName, xListener ); } void SAL_CALL TitleWrapper::removePropertyChangeListener( const OUString& rPropertyName, const Reference< beans::XPropertyChangeListener >& xListener ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { sal_Int32 nHandle = getInfoHelper().getHandleByName( rPropertyName ); if( CharacterProperties::IsCharacterPropertyHandle( nHandle ) ) @@ -502,19 +480,16 @@ const std::vector< WrappedProperty* > TitleWrapper::createWrappedProperties() } OUString SAL_CALL TitleWrapper::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.Title"); } sal_Bool SAL_CALL TitleWrapper::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL TitleWrapper::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart.ChartTitle", diff --git a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx index 4017385040b9..b986eb9a2c8c 100644 --- a/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/TitleWrapper.hxx @@ -53,12 +53,9 @@ public: virtual ~TitleWrapper() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; //ReferenceSizePropertyProvider virtual void updateReferenceSize() override; @@ -67,45 +64,35 @@ public: protected: // ____ XShape ____ - virtual css::awt::Point SAL_CALL getPosition() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Size SAL_CALL getSize() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSize( const css::awt::Size& aSize ) - throw (css::beans::PropertyVetoException, - css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getPosition() override; + virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override; + virtual css::awt::Size SAL_CALL getSize() override; + virtual void SAL_CALL setSize( const css::awt::Size& aSize ) override; // ____ XShapeDescriptor (base of XShape) ____ - virtual OUString SAL_CALL getShapeType() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getShapeType() override; // ____ XComponent ____ - virtual void SAL_CALL dispose() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; // character properties have to be handled differently (via the XFormattedString elements) void getFastCharacterPropertyValue( sal_Int32 nHandle, css::uno::Any& rValue ); /// @throws css::uno::Exception - void setFastCharacterPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue ) - throw (css::uno::Exception); + void setFastCharacterPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue ); // ____ WrappedPropertySet ____ - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; - virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override; - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override; virtual css::uno::Reference< css::beans::XPropertySet > getInnerPropertySet() override; diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx index ef048b1d945d..19bd0ba2ac1b 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.cxx @@ -138,7 +138,6 @@ UpDownBarWrapper::~UpDownBarWrapper() // ____ XComponent ____ void SAL_CALL UpDownBarWrapper::dispose() - throw (uno::RuntimeException, std::exception) { Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -146,26 +145,22 @@ void SAL_CALL UpDownBarWrapper::dispose() void SAL_CALL UpDownBarWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL UpDownBarWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } //XPropertySet uno::Reference< beans::XPropertySetInfo > SAL_CALL UpDownBarWrapper::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticUpDownBarWrapperInfo::get(); } void SAL_CALL UpDownBarWrapper::setPropertyValue( const OUString& rPropertyName, const uno::Any& rValue ) - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xPropSet(nullptr); @@ -187,7 +182,6 @@ void SAL_CALL UpDownBarWrapper::setPropertyValue( const OUString& rPropertyName, xPropSet->setPropertyValue( rPropertyName, rValue ); } uno::Any SAL_CALL UpDownBarWrapper::getPropertyValue( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Any aRet; @@ -213,22 +207,18 @@ uno::Any SAL_CALL UpDownBarWrapper::getPropertyValue( const OUString& rPropertyN } void SAL_CALL UpDownBarWrapper::addPropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*xListener*/ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL UpDownBarWrapper::removePropertyChangeListener( const OUString& /*aPropertyName*/, const uno::Reference< beans::XPropertyChangeListener >& /*aListener*/ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL UpDownBarWrapper::addVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL UpDownBarWrapper::removeVetoableChangeListener( const OUString& /*PropertyName*/, const uno::Reference< beans::XVetoableChangeListener >& /*aListener*/ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } @@ -236,7 +226,6 @@ void SAL_CALL UpDownBarWrapper::removeVetoableChangeListener( const OUString& /* //XMultiPropertySet //getPropertySetInfo() already declared in XPropertySet void SAL_CALL UpDownBarWrapper::setPropertyValues( const uno::Sequence< OUString >& rNameSeq, const uno::Sequence< uno::Any >& rValueSeq ) - throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { sal_Int32 nMinCount = std::min( rValueSeq.getLength(), rNameSeq.getLength() ); for(sal_Int32 nN=0; nN SAL_CALL UpDownBarWrapper::getPropertyValues( const uno::Sequence< OUString >& rNameSeq ) - throw (uno::RuntimeException, std::exception) { Sequence< Any > aRetSeq; if( rNameSeq.getLength() ) @@ -269,24 +257,20 @@ uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyValues( const un return aRetSeq; } void SAL_CALL UpDownBarWrapper::addPropertiesChangeListener( const uno::Sequence< OUString >& /* aPropertyNames */, const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ ) - throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL UpDownBarWrapper::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ ) - throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL UpDownBarWrapper::firePropertiesChangeEvent( const uno::Sequence< OUString >& /* aPropertyNames */, const uno::Reference< beans::XPropertiesChangeListener >& /* xListener */ ) - throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } //XPropertyState beans::PropertyState SAL_CALL UpDownBarWrapper::getPropertyState( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { uno::Any aDefault( this->getPropertyDefault( rPropertyName ) ); uno::Any aValue( this->getPropertyValue( rPropertyName ) ); @@ -297,7 +281,6 @@ beans::PropertyState SAL_CALL UpDownBarWrapper::getPropertyState( const OUString return beans::PropertyState_DIRECT_VALUE; } uno::Sequence< beans::PropertyState > SAL_CALL UpDownBarWrapper::getPropertyStates( const uno::Sequence< OUString >& rNameSeq ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { Sequence< beans::PropertyState > aRetSeq; if( rNameSeq.getLength() ) @@ -312,13 +295,11 @@ uno::Sequence< beans::PropertyState > SAL_CALL UpDownBarWrapper::getPropertyStat return aRetSeq; } void SAL_CALL UpDownBarWrapper::setPropertyToDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { this->setPropertyValue( rPropertyName, this->getPropertyDefault(rPropertyName) ); } uno::Any SAL_CALL UpDownBarWrapper::getPropertyDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { const tPropertyValueMap& rStaticDefaults = *StaticUpDownBarWrapperDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( StaticUpDownBarWrapperInfoHelper::get()->getHandleByName( rPropertyName ) ) ); @@ -330,7 +311,6 @@ uno::Any SAL_CALL UpDownBarWrapper::getPropertyDefault( const OUString& rPropert //XMultiPropertyStates //getPropertyStates() already declared in XPropertyState void SAL_CALL UpDownBarWrapper::setAllPropertiesToDefault( ) - throw (uno::RuntimeException, std::exception) { const Sequence< beans::Property >& rPropSeq = *StaticUpDownBarWrapperPropertyArray::get(); for(sal_Int32 nN=0; nN& rNameSeq ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { for(sal_Int32 nN=0; nN SAL_CALL UpDownBarWrapper::getPropertyDefaults( const uno::Sequence< OUString >& rNameSeq ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Sequence< Any > aRetSeq; if( rNameSeq.getLength() ) @@ -365,19 +343,16 @@ uno::Sequence< uno::Any > SAL_CALL UpDownBarWrapper::getPropertyDefaults( const } OUString SAL_CALL UpDownBarWrapper::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.ChartArea"); } sal_Bool SAL_CALL UpDownBarWrapper::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL UpDownBarWrapper::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart.ChartArea", diff --git a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx index dca66c5333fc..6e902d487062 100644 --- a/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/UpDownBarWrapper.hxx @@ -58,53 +58,47 @@ public: virtual ~UpDownBarWrapper() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // ____ XComponent ____ - virtual void SAL_CALL dispose() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; virtual void SAL_CALL addEventListener( const css::uno::Reference< - css::lang::XEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + css::lang::XEventListener >& xListener ) override; virtual void SAL_CALL removeEventListener( const css::uno::Reference< - css::lang::XEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + css::lang::XEventListener >& aListener ) override; //XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; //XMultiPropertySet //getPropertySetInfo() already declared in XPropertySet - virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) override; + virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; + virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; //XPropertyState - virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override; + virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) override; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override; //XMultiPropertyStates //getPropertyStates() already declared in XPropertyState - virtual void SAL_CALL setAllPropertiesToDefault( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setAllPropertiesToDefault( ) override; + virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx index 9610bb600392..f179264767fe 100644 --- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.cxx @@ -93,7 +93,6 @@ WallFloorWrapper::~WallFloorWrapper() // ____ XComponent ____ void SAL_CALL WallFloorWrapper::dispose() - throw (uno::RuntimeException, std::exception) { Reference< uno::XInterface > xSource( static_cast< ::cppu::OWeakObject* >( this ) ); m_aEventListenerContainer.disposeAndClear( lang::EventObject( xSource ) ); @@ -104,14 +103,12 @@ void SAL_CALL WallFloorWrapper::dispose() void SAL_CALL WallFloorWrapper::addEventListener( const Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.addInterface( xListener ); } void SAL_CALL WallFloorWrapper::removeEventListener( const Reference< lang::XEventListener >& aListener ) - throw (uno::RuntimeException, std::exception) { m_aEventListenerContainer.removeInterface( aListener ); } @@ -153,19 +150,16 @@ const std::vector< WrappedProperty* > WallFloorWrapper::createWrappedProperties( } OUString SAL_CALL WallFloorWrapper::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.WallOrFloor"); } sal_Bool SAL_CALL WallFloorWrapper::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL WallFloorWrapper::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.xml.UserDefinedAttributesSupplier", diff --git a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx index 60cd15aff708..c49e6c9ccdbd 100644 --- a/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx +++ b/chart2/source/controller/chartapiwrapper/WallFloorWrapper.hxx @@ -48,20 +48,14 @@ public: virtual ~WallFloorWrapper() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // ____ XComponent ____ - virtual void SAL_CALL dispose() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; protected: // ____ WrappedPropertySet ____ diff --git a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx index 241f716c09ca..ffd6baa83711 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.cxx @@ -39,7 +39,6 @@ WrappedAddInProperty::~WrappedAddInProperty() } void WrappedAddInProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { Reference< util::XRefreshable > xAddIn; if( ! (rOuterValue >>= xAddIn) ) @@ -49,7 +48,6 @@ void WrappedAddInProperty::setPropertyValue( const Any& rOuterValue, const Refer } Any WrappedAddInProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return uno::makeAny( m_rChartDocumentWrapper.getAddIn() ); } @@ -64,7 +62,6 @@ WrappedBaseDiagramProperty::~WrappedBaseDiagramProperty() } void WrappedBaseDiagramProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { OUString aBaseDiagram; if( ! (rOuterValue >>= aBaseDiagram) ) @@ -74,7 +71,6 @@ void WrappedBaseDiagramProperty::setPropertyValue( const Any& rOuterValue, const } Any WrappedBaseDiagramProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return uno::makeAny( m_rChartDocumentWrapper.getBaseDiagram() ); } @@ -89,13 +85,11 @@ WrappedAdditionalShapesProperty::~WrappedAdditionalShapesProperty() } void WrappedAdditionalShapesProperty::setPropertyValue( const Any& /*rOuterValue*/, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { throw lang::IllegalArgumentException( "AdditionalShapes is a read only property", nullptr, 0 ); } Any WrappedAdditionalShapesProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return uno::makeAny( m_rChartDocumentWrapper.getAdditionalShapes() ); } @@ -110,7 +104,6 @@ WrappedRefreshAddInAllowedProperty::~WrappedRefreshAddInAllowedProperty() } void WrappedRefreshAddInAllowedProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /* xInnerPropertySet */ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { bool bUpdateAddIn = true; if( ! (rOuterValue >>= bUpdateAddIn) ) @@ -120,7 +113,6 @@ void WrappedRefreshAddInAllowedProperty::setPropertyValue( const Any& rOuterValu } Any WrappedRefreshAddInAllowedProperty::getPropertyValue( const Reference< beans::XPropertySet >& /* xInnerPropertySet */ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return uno::makeAny( m_rChartDocumentWrapper.getUpdateAddIn() ); } diff --git a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx index fc7ea946935b..a95bf97bc4f9 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAddInProperty.hxx @@ -33,11 +33,9 @@ public: explicit WrappedAddInProperty( ChartDocumentWrapper& rChartDocumentWrapper ); virtual ~WrappedAddInProperty() override; - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; private: ChartDocumentWrapper& m_rChartDocumentWrapper; @@ -49,11 +47,9 @@ public: explicit WrappedBaseDiagramProperty( ChartDocumentWrapper& rChartDocumentWrapper ); virtual ~WrappedBaseDiagramProperty() override; - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; private: ChartDocumentWrapper& m_rChartDocumentWrapper; @@ -65,11 +61,9 @@ public: explicit WrappedAdditionalShapesProperty( ChartDocumentWrapper& rChartDocumentWrapper ); virtual ~WrappedAdditionalShapesProperty() override; - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; private: ChartDocumentWrapper& m_rChartDocumentWrapper; @@ -81,11 +75,9 @@ public: explicit WrappedRefreshAddInAllowedProperty( ChartDocumentWrapper& rChartDocumentWrapper ); virtual ~WrappedRefreshAddInAllowedProperty() override; - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; private: ChartDocumentWrapper& m_rChartDocumentWrapper; diff --git a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx index 605fd723cb86..39bcb5140f41 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAutomaticPositionProperties.cxx @@ -38,12 +38,9 @@ class WrappedAutomaticPositionProperty : public WrappedProperty public: WrappedAutomaticPositionProperty(); - virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) override; - virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override; - virtual Any getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override; + virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const override; + virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const override; + virtual Any getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const override; }; WrappedAutomaticPositionProperty::WrappedAutomaticPositionProperty() @@ -52,7 +49,6 @@ WrappedAutomaticPositionProperty::WrappedAutomaticPositionProperty() } void WrappedAutomaticPositionProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { if( xInnerPropertySet.is() ) { @@ -77,7 +73,6 @@ void WrappedAutomaticPositionProperty::setPropertyValue( const Any& rOuterValue, } Any WrappedAutomaticPositionProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet( getPropertyDefault( Reference< beans::XPropertyState >( xInnerPropertySet, uno::UNO_QUERY ) ) ); if( xInnerPropertySet.is() ) @@ -90,7 +85,6 @@ Any WrappedAutomaticPositionProperty::getPropertyValue( const Reference< beans:: } Any WrappedAutomaticPositionProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= false; diff --git a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx index 8aebd9fb02cb..bd80bbd16009 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedAxisAndGridExistenceProperties.cxx @@ -38,14 +38,11 @@ public: WrappedAxisAndGridExistenceProperty( bool bAxis, bool bMain, sal_Int32 nDimensionIndex , const std::shared_ptr& spChart2ModelContact ); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -139,7 +136,6 @@ WrappedAxisAndGridExistenceProperty::WrappedAxisAndGridExistenceProperty( bool b } void WrappedAxisAndGridExistenceProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { bool bNewValue = false; if( ! (rOuterValue >>= bNewValue) ) @@ -169,7 +165,6 @@ void WrappedAxisAndGridExistenceProperty::setPropertyValue( const Any& rOuterVal } Any WrappedAxisAndGridExistenceProperty::getPropertyValue( const Reference< beans::XPropertySet >& /* xInnerPropertySet */ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() ); @@ -187,7 +182,6 @@ Any WrappedAxisAndGridExistenceProperty::getPropertyValue( const Reference< bean } Any WrappedAxisAndGridExistenceProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= false; @@ -200,14 +194,11 @@ public: WrappedAxisTitleExistenceProperty( sal_Int32 nTitleIndex , const std::shared_ptr& spChart2ModelContact ); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -256,7 +247,6 @@ WrappedAxisTitleExistenceProperty::WrappedAxisTitleExistenceProperty(sal_Int32 n } void WrappedAxisTitleExistenceProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { bool bNewValue = false; if( ! (rOuterValue >>= bNewValue) ) @@ -281,7 +271,6 @@ void WrappedAxisTitleExistenceProperty::setPropertyValue( const Any& rOuterValue } Any WrappedAxisTitleExistenceProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { bool bHasTitle = false; @@ -296,7 +285,6 @@ Any WrappedAxisTitleExistenceProperty::getPropertyValue( const Reference< beans: } Any WrappedAxisTitleExistenceProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= false; @@ -309,14 +297,11 @@ public: WrappedAxisLabelExistenceProperty( bool bMain, sal_Int32 nDimensionIndex , const std::shared_ptr& spChart2ModelContact ); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -357,7 +342,6 @@ WrappedAxisLabelExistenceProperty::WrappedAxisLabelExistenceProperty(bool bMain, } void WrappedAxisLabelExistenceProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { bool bNewValue = false; if( ! (rOuterValue >>= bNewValue) ) @@ -383,7 +367,6 @@ void WrappedAxisLabelExistenceProperty::setPropertyValue( const Any& rOuterValue } Any WrappedAxisLabelExistenceProperty::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() ); @@ -396,7 +379,6 @@ Any WrappedAxisLabelExistenceProperty::getPropertyValue( const Reference< beans: } Any WrappedAxisLabelExistenceProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= true; diff --git a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx index 78a0076f82f8..0a63ae3cb19a 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.cxx @@ -51,7 +51,6 @@ void WrappedCharacterHeightProperty::addWrappedProperties( std::vector< WrappedP } void WrappedCharacterHeightProperty_Base::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { if(xInnerPropertySet.is()) { @@ -62,7 +61,6 @@ void WrappedCharacterHeightProperty_Base::setPropertyValue( const Any& rOuterVal } Any WrappedCharacterHeightProperty_Base::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; if( xInnerPropertySet.is() ) @@ -87,7 +85,6 @@ Any WrappedCharacterHeightProperty_Base::getPropertyValue( const Reference< bean } Any WrappedCharacterHeightProperty_Base::getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; if( xInnerPropertyState.is() ) @@ -98,7 +95,6 @@ Any WrappedCharacterHeightProperty_Base::getPropertyDefault( const Reference< be } beans::PropertyState WrappedCharacterHeightProperty_Base::getPropertyState( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) { return beans::PropertyState_DIRECT_VALUE; } diff --git a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx index cd065de41d33..6902ebb91b86 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedCharacterHeightProperty.hxx @@ -36,17 +36,13 @@ public: WrappedCharacterHeightProperty_Base( const OUString& rOuterEqualsInnerName, ReferenceSizePropertyProvider* pRefSizePropProvider ); virtual ~WrappedCharacterHeightProperty_Base() override; - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; - virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override; + virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; protected: virtual css::uno::Any convertInnerToOuterValue( const css::uno::Any& rInnerValue ) const override; diff --git a/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx index 9e135594fe82..93bbda452c22 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedGL3DProperties.cxx @@ -55,9 +55,7 @@ public: WrappedGL3DProperty( const OUString& rInName, const OUString& rOutName, const uno::Any& rDefault, const std::shared_ptr& pContact ) : WrappedProperty(rInName, rOutName), maDefault(rDefault), mpModelContact(pContact) {} - virtual uno::Any getPropertyValue( const uno::Reference& /*xInnerPS*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException) override + virtual uno::Any getPropertyValue( const uno::Reference& /*xInnerPS*/ ) const override { uno::Reference xCT = getChartType(); if (!xCT.is()) @@ -74,10 +72,7 @@ public: }; virtual void setPropertyValue( - const uno::Any& rOutValue, const uno::Reference& /*xInnerPS*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException) override + const uno::Any& rOutValue, const uno::Reference& /*xInnerPS*/ ) const override { uno::Reference xCT = getChartType(); if (!xCT.is()) @@ -91,8 +86,7 @@ public: catch ( const uno::Exception& ) {} } - virtual void setPropertyToDefault( const uno::Reference& /*xInnerPropState*/ ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) override + virtual void setPropertyToDefault( const uno::Reference& /*xInnerPropState*/ ) const override { uno::Reference xCT = getChartType(); if (!xCT.is()) @@ -106,15 +100,12 @@ public: catch ( const uno::Exception& ) {} } - virtual uno::Any getPropertyDefault( const uno::Reference& /*xInnerPS*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, - uno::RuntimeException) override + virtual uno::Any getPropertyDefault( const uno::Reference& /*xInnerPS*/ ) const override { return maDefault; } - virtual beans::PropertyState getPropertyState( const uno::Reference& /*xInnerPS*/ ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) override + virtual beans::PropertyState getPropertyState( const uno::Reference& /*xInnerPS*/ ) const override { return beans::PropertyState_DIRECT_VALUE; } diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx index 68d9681345e9..57fa2a3aa3c2 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.cxx @@ -59,7 +59,6 @@ WrappedBarPositionProperty_Base::~WrappedBarPositionProperty_Base() } void WrappedBarPositionProperty_Base::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { sal_Int32 nNewValue = 0; if( ! (rOuterValue >>= nNewValue) ) @@ -109,7 +108,6 @@ void WrappedBarPositionProperty_Base::setPropertyValue( const Any& rOuterValue, } Any WrappedBarPositionProperty_Base::getPropertyValue( const Reference< beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() ); if( xDiagram.is() ) diff --git a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx index 27b51f40a9a4..8838ed066d1a 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedGapwidthProperty.hxx @@ -39,11 +39,9 @@ public: , const std::shared_ptr& spChart2ModelContact ); virtual ~WrappedBarPositionProperty_Base() override; - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; void setDimensionAndAxisIndex( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ); diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx index 966dead7aad7..0b41f8900c9a 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.cxx @@ -42,7 +42,6 @@ WrappedNumberFormatProperty::~WrappedNumberFormatProperty() } void WrappedNumberFormatProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { sal_Int32 nFormat = 0; if( ! (rOuterValue >>= nFormat) ) @@ -53,7 +52,6 @@ void WrappedNumberFormatProperty::setPropertyValue( const Any& rOuterValue, cons } Any WrappedNumberFormatProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { if( !xInnerPropertySet.is() ) { @@ -78,7 +76,6 @@ Any WrappedNumberFormatProperty::getPropertyValue( const Reference< beans::XProp } Any WrappedNumberFormatProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return uno::makeAny( sal_Int32( 0 ) ); } @@ -93,7 +90,6 @@ WrappedLinkNumberFormatProperty::~WrappedLinkNumberFormatProperty() } void WrappedLinkNumberFormatProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { if( !xInnerPropertySet.is() ) { @@ -105,7 +101,6 @@ void WrappedLinkNumberFormatProperty::setPropertyValue( const Any& rOuterValue, } Any WrappedLinkNumberFormatProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { if( !xInnerPropertySet.is() ) { @@ -117,7 +112,6 @@ Any WrappedLinkNumberFormatProperty::getPropertyValue( const Reference< beans::X } Any WrappedLinkNumberFormatProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { bool bLink = true; return uno::makeAny( bLink ); diff --git a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx index 567e9320c597..296e1fcc7262 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedNumberFormatProperty.hxx @@ -37,14 +37,11 @@ public: explicit WrappedNumberFormatProperty(const std::shared_ptr& spChart2ModelContact); virtual ~WrappedNumberFormatProperty() override; - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; friend class WrappedLinkNumberFormatProperty; private: @@ -57,14 +54,11 @@ public: explicit WrappedLinkNumberFormatProperty(); virtual ~WrappedLinkNumberFormatProperty() override; - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; }; diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx index 2be350b47a0f..bd042609183e 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.cxx @@ -125,19 +125,16 @@ void WrappedScaleProperty::addWrappedProperties( std::vector< WrappedProperty* > } void WrappedScaleProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { setPropertyValue( m_eScaleProperty, rOuterValue, xInnerPropertySet ); } Any WrappedScaleProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return getPropertyValue( m_eScaleProperty, xInnerPropertySet ); } void WrappedScaleProperty::setPropertyValue( tScaleProperty eScaleProperty, const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { m_aOuterValue = rOuterValue; @@ -345,7 +342,6 @@ void WrappedScaleProperty::setPropertyValue( tScaleProperty eScaleProperty, cons } Any WrappedScaleProperty::getPropertyValue( tScaleProperty eScaleProperty, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet( m_aOuterValue ); diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx index 164731da68ca..35bd6b30bcf7 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleProperty.hxx @@ -59,11 +59,9 @@ public: static void addWrappedProperties( std::vector< WrappedProperty* >& rList, const std::shared_ptr< Chart2ModelContact >& spChart2ModelContact ); - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; protected: //methods /// @throws css::beans::UnknownPropertyException @@ -71,13 +69,11 @@ protected: //methods /// @throws css::lang::IllegalArgumentException /// @throws css::lang::WrappedTargetException /// @throws css::uno::RuntimeException - void setPropertyValue( tScaleProperty eScaleProperty, const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException); + void setPropertyValue( tScaleProperty eScaleProperty, const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const; /// @throws css::beans::UnknownPropertyException /// @throws css::lang::WrappedTargetException /// @throws css::uno::RuntimeException - css::uno::Any getPropertyValue( tScaleProperty eScaleProperty, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); + css::uno::Any getPropertyValue( tScaleProperty eScaleProperty, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const; private: //member std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; diff --git a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx index 6d19e2ef31c5..5bdd1404089c 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedScaleTextProperties.cxx @@ -38,12 +38,9 @@ class WrappedScaleTextProperty : public WrappedProperty public: explicit WrappedScaleTextProperty(const std::shared_ptr& spChart2ModelContact); - virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) override; - virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override; - virtual Any getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override; + virtual void setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const override; + virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const override; + virtual Any getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const override; private: std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; @@ -56,7 +53,6 @@ WrappedScaleTextProperty::WrappedScaleTextProperty(const std::shared_ptr& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { static const char aRefSizeName[] = "ReferencePageSize"; @@ -87,7 +83,6 @@ void WrappedScaleTextProperty::setPropertyValue( const Any& rOuterValue, const R } Any WrappedScaleTextProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet( getPropertyDefault( Reference< beans::XPropertyState >( xInnerPropertySet, uno::UNO_QUERY ) ) ); if( xInnerPropertySet.is() ) @@ -102,7 +97,6 @@ Any WrappedScaleTextProperty::getPropertyValue( const Reference< beans::XPropert } Any WrappedScaleTextProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; aRet <<= false; diff --git a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx index fb1fa0360d4d..0de7f6d77378 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.cxx @@ -50,7 +50,6 @@ WrappedD3DTransformMatrixProperty::~WrappedD3DTransformMatrixProperty() } void WrappedD3DTransformMatrixProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { if( DiagramHelper::isPieOrDonutChart( m_spChart2ModelContact->getChart2Diagram() ) ) { @@ -76,7 +75,6 @@ void WrappedD3DTransformMatrixProperty::setPropertyValue( const Any& rOuterValue } Any WrappedD3DTransformMatrixProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { if( DiagramHelper::isPieOrDonutChart( m_spChart2ModelContact->getChart2Diagram() ) ) { diff --git a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx index 36564addd3c2..e587f417296c 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSceneProperty.hxx @@ -44,11 +44,9 @@ public: const std::shared_ptr& spChart2ModelContact); virtual ~WrappedD3DTransformMatrixProperty() override; - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; private: std::shared_ptr< Chart2ModelContact > m_spChart2ModelContact; diff --git a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx index 14bbb7d4fd5e..e5ba28c44b45 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSeriesOrDiagramProperty.hxx @@ -109,8 +109,7 @@ public: } } } - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override { PROPERTYTYPE aNewValue = PROPERTYTYPE(); if( ! (rOuterValue >>= aNewValue) ) @@ -134,8 +133,7 @@ public: } } - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override { if( m_ePropertyType == DIAGRAM ) { @@ -158,8 +156,7 @@ public: } } - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& /* xInnerPropertyState */ ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& /* xInnerPropertyState */ ) const override { return m_aDefaultValue; } diff --git a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx index e7af4fffaf94..9b1d869ee5e7 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSplineProperties.cxx @@ -93,8 +93,7 @@ public: } return bHasDetectableInnerValue; } - void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override + void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& /*xInnerPropertySet*/ ) const override { PROPERTYTYPE aNewValue; if( ! (rOuterValue >>= aNewValue) ) @@ -131,8 +130,7 @@ public: } } - css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override + css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& /*xInnerPropertySet*/ ) const override { bool bHasAmbiguousValue = false; PROPERTYTYPE aValue; @@ -143,8 +141,7 @@ public: return m_aOuterValue; } - css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override + css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& /*xInnerPropertyState*/ ) const override { return m_aDefaultValue; } diff --git a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx index 1b95c37d9252..c7f16fe0d61b 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedStockProperties.cxx @@ -42,11 +42,9 @@ public: , const css::uno::Any& rDefaulValue , const std::shared_ptr& spChart2ModelContact ); - void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; virtual uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const = 0; @@ -67,7 +65,6 @@ WrappedStockProperty::WrappedStockProperty( const OUString& rOuterName } void WrappedStockProperty::setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& /*xInnerPropertySet*/ ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) { bool bNewValue = false; if( ! (rOuterValue >>= bNewValue) ) @@ -104,7 +101,6 @@ void WrappedStockProperty::setPropertyValue( const css::uno::Any& rOuterValue, c } css::uno::Any WrappedStockProperty::getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) { return m_aDefaultValue; } @@ -114,8 +110,7 @@ class WrappedVolumeProperty : public WrappedStockProperty public: explicit WrappedVolumeProperty(const std::shared_ptr& spChart2ModelContact); - css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const override; }; @@ -126,7 +121,6 @@ WrappedVolumeProperty::WrappedVolumeProperty(const std::shared_ptr& /*xInnerPropertySet*/ ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) { Reference< chart2::XChartDocument > xChartDoc( m_spChart2ModelContact->getChart2Document() ); Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() ); @@ -181,8 +175,7 @@ class WrappedUpDownProperty : public WrappedStockProperty public: explicit WrappedUpDownProperty(const std::shared_ptr& spChart2ModelContact); - css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; uno::Reference< chart2::XChartTypeTemplate > getNewTemplate( bool bNewValue, const OUString& rCurrentTemplate, const Reference< lang::XMultiServiceFactory >& xFactory ) const override; }; @@ -193,7 +186,6 @@ WrappedUpDownProperty::WrappedUpDownProperty(const std::shared_ptr& /*xInnerPropertySet*/ ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) { Reference< chart2::XChartDocument > xChartDoc( m_spChart2ModelContact->getChart2Document() ); Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() ); diff --git a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx index 1f8a99eff6c5..ba107ea2e72b 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx @@ -55,10 +55,8 @@ public: virtual sal_Int32 getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override; virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const sal_Int32& aNewValue ) const override; - virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) override; - virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) override; + virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const override; + virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const override; explicit WrappedSymbolTypeProperty(const std::shared_ptr& spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType); @@ -79,8 +77,7 @@ class WrappedSymbolSizeProperty : public WrappedSeriesOrDiagramProperty< awt::Si public: virtual awt::Size getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override; virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const awt::Size& aNewSize ) const override; - virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) override; + virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const override; explicit WrappedSymbolSizeProperty(const std::shared_ptr& spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType); @@ -91,8 +88,7 @@ class WrappedSymbolAndLinesProperty : public WrappedSeriesOrDiagramProperty< boo public: virtual bool getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const override; virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, const bool& bDrawLines ) const override; - virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) override; + virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const override; explicit WrappedSymbolAndLinesProperty(const std::shared_ptr& spChart2ModelContact, tSeriesOrDiagramPropertyType ePropertyType); @@ -242,7 +238,6 @@ void WrappedSymbolTypeProperty::setValueToSeries( const Reference< beans::XPrope } Any WrappedSymbolTypeProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { //the old chart (< OOo 2.3) needs symbol-type="automatic" at the plot-area if any of the series should be able to have symbols if( m_ePropertyType == DIAGRAM ) @@ -274,7 +269,6 @@ Any WrappedSymbolTypeProperty::getPropertyValue( const Reference< beans::XProper } beans::PropertyState WrappedSymbolTypeProperty::getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) { //the special situation for this property here is that the diagram default can be //different from the normal default and different from all singles series values @@ -451,7 +445,6 @@ void WrappedSymbolSizeProperty::setValueToSeries( } beans::PropertyState WrappedSymbolSizeProperty::getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) { //only export symbol size if necessary if( m_ePropertyType == DIAGRAM ) @@ -511,7 +504,6 @@ void WrappedSymbolAndLinesProperty::setValueToSeries( } beans::PropertyState WrappedSymbolAndLinesProperty::getPropertyState( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) { //do not export this property anymore, instead use a linestyle none for no lines return beans::PropertyState_DEFAULT_VALUE; diff --git a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx index 9d496a3d9886..bd371b35b80e 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx +++ b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.cxx @@ -37,7 +37,6 @@ WrappedTextRotationProperty::~WrappedTextRotationProperty() } beans::PropertyState WrappedTextRotationProperty::getPropertyState( const uno::Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) { if( m_bDirectState ) return beans::PropertyState_DIRECT_VALUE; diff --git a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx index 8525d61be525..faf102bb0b6e 100644 --- a/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx +++ b/chart2/source/controller/chartapiwrapper/WrappedTextRotationProperty.hxx @@ -30,8 +30,7 @@ public: explicit WrappedTextRotationProperty( bool bDirectState=false ); virtual ~WrappedTextRotationProperty() override; - virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override; + virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; protected: virtual css::uno::Any convertInnerToOuterValue( const css::uno::Any& rInnerValue ) const override; diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx index b9b82fc0705d..1d434d4f86e6 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.cxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.cxx @@ -403,7 +403,7 @@ void ChartTypeDialogController::fillExtraControls( const ChartTypeParameter& /*r , const uno::Reference< beans::XPropertySet >& /*xTemplateProps*/ ) const { } -void ChartTypeDialogController::setTemplateProperties( const uno::Reference< beans::XPropertySet >& /*xTemplateProps*/ ) const throw (uno::RuntimeException) +void ChartTypeDialogController::setTemplateProperties( const uno::Reference< beans::XPropertySet >& /*xTemplateProps*/ ) const { } @@ -1224,7 +1224,7 @@ void CombiColumnLineChartDialogController::fillExtraControls( const ChartTypePar m_pMF_NumberOfLines->SetLast( nMaxLines ); m_pMF_NumberOfLines->SetMax( nMaxLines ); } -void CombiColumnLineChartDialogController::setTemplateProperties( const uno::Reference< beans::XPropertySet >& xTemplateProps ) const throw (uno::RuntimeException) +void CombiColumnLineChartDialogController::setTemplateProperties( const uno::Reference< beans::XPropertySet >& xTemplateProps ) const { if( xTemplateProps.is() ) { diff --git a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx index 39647f97a580..0c40bd95087b 100644 --- a/chart2/source/controller/dialogs/ChartTypeDialogController.hxx +++ b/chart2/source/controller/dialogs/ChartTypeDialogController.hxx @@ -112,7 +112,7 @@ public: , const css::uno::Reference< css::chart2::XChartDocument >& xChartModel , const css::uno::Reference< css::beans::XPropertySet >& xTemplateProps ) const; /// @throws css::uno::RuntimeException - virtual void setTemplateProperties( const css::uno::Reference< css::beans::XPropertySet >& xTemplateProps ) const throw (css::uno::RuntimeException); + virtual void setTemplateProperties( const css::uno::Reference< css::beans::XPropertySet >& xTemplateProps ) const; bool isSubType( const OUString& rServiceName ); ChartTypeParameter getChartTypeParameterForService( const OUString& rServiceName, const css::uno::Reference< @@ -278,7 +278,7 @@ public: , const css::uno::Reference< css::chart2::XChartDocument >& xChartModel , const css::uno::Reference< css::beans::XPropertySet >& xTemplateProps ) const override; - virtual void setTemplateProperties( const css::uno::Reference< css::beans::XPropertySet >& xTemplateProps ) const throw (css::uno::RuntimeException) override; + virtual void setTemplateProperties( const css::uno::Reference< css::beans::XPropertySet >& xTemplateProps ) const override; private: DECL_LINK( ChangeLineCountHdl, Edit&, void ); diff --git a/chart2/source/controller/dialogs/RangeSelectionListener.cxx b/chart2/source/controller/dialogs/RangeSelectionListener.cxx index a6860d374494..f3ffec17c85b 100644 --- a/chart2/source/controller/dialogs/RangeSelectionListener.cxx +++ b/chart2/source/controller/dialogs/RangeSelectionListener.cxx @@ -40,21 +40,18 @@ RangeSelectionListener::~RangeSelectionListener() // ____ XRangeSelectionListener ____ void SAL_CALL RangeSelectionListener::done( const sheet::RangeSelectionEvent& aEvent ) - throw (uno::RuntimeException, std::exception) { m_aRange = aEvent.RangeDescriptor; m_rParent.listeningFinished( m_aRange ); } void SAL_CALL RangeSelectionListener::aborted( const sheet::RangeSelectionEvent& /*aEvent*/ ) - throw (uno::RuntimeException, std::exception) { m_rParent.listeningFinished( m_aRange ); } // ____ XEventListener ____ void SAL_CALL RangeSelectionListener::disposing( const lang::EventObject& /*Source*/ ) - throw (uno::RuntimeException, std::exception) { m_rParent.disposingRangeSelection(); } diff --git a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx index fc1384d52e3f..71f5c00bd82a 100644 --- a/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_ChartType_UNO.cxx @@ -41,16 +41,16 @@ ChartTypeUnoDlg::~ChartTypeUnoDlg() } } // lang::XServiceInfo -OUString SAL_CALL ChartTypeUnoDlg::getImplementationName() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ChartTypeUnoDlg::getImplementationName() { return OUString(CHART_TYPE_DIALOG_SERVICE_IMPLEMENTATION_NAME); } -css::uno::Sequence SAL_CALL ChartTypeUnoDlg::getSupportedServiceNames() throw(uno::RuntimeException, std::exception) +css::uno::Sequence SAL_CALL ChartTypeUnoDlg::getSupportedServiceNames() { return { CHART_TYPE_DIALOG_SERVICE_NAME }; } -uno::Sequence< sal_Int8 > SAL_CALL ChartTypeUnoDlg::getImplementationId() throw( uno::RuntimeException, std::exception ) +uno::Sequence< sal_Int8 > SAL_CALL ChartTypeUnoDlg::getImplementationId() { return css::uno::Sequence(); } @@ -71,7 +71,7 @@ VclPtr ChartTypeUnoDlg::createDialog(vcl::Window* _pParent) { return VclPtr::Create( _pParent, m_xChartModel ); } -uno::Reference SAL_CALL ChartTypeUnoDlg::getPropertySetInfo() throw(uno::RuntimeException, std::exception) +uno::Reference SAL_CALL ChartTypeUnoDlg::getPropertySetInfo() { return createPropertySetInfo( getInfoHelper() ); } diff --git a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx index 065a511ea68d..096fecf0c1e5 100644 --- a/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx +++ b/chart2/source/controller/dialogs/dlg_CreationWizard_UNO.cxx @@ -58,25 +58,22 @@ CreationWizardUnoDlg::~CreationWizardUnoDlg() } // lang::XServiceInfo OUString SAL_CALL CreationWizardUnoDlg::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString(CHART_WIZARD_DIALOG_SERVICE_IMPLEMENTATION_NAME); } sal_Bool SAL_CALL CreationWizardUnoDlg::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL CreationWizardUnoDlg::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CHART_WIZARD_DIALOG_SERVICE_NAME }; } // XInterface -uno::Any SAL_CALL CreationWizardUnoDlg::queryInterface( const uno::Type& aType ) throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL CreationWizardUnoDlg::queryInterface( const uno::Type& aType ) { return OComponentHelper::queryInterface( aType ); } @@ -88,7 +85,7 @@ void SAL_CALL CreationWizardUnoDlg::release() throw () { OComponentHelper::release(); } -uno::Any SAL_CALL CreationWizardUnoDlg::queryAggregation( uno::Type const & rType ) throw (uno::RuntimeException, std::exception) +uno::Any SAL_CALL CreationWizardUnoDlg::queryAggregation( uno::Type const & rType ) { if (rType == cppu::UnoType::get()) { @@ -118,7 +115,7 @@ uno::Any SAL_CALL CreationWizardUnoDlg::queryAggregation( uno::Type const & rTyp return OComponentHelper::queryAggregation( rType ); } -uno::Sequence< uno::Type > CreationWizardUnoDlg::getTypes() throw(uno::RuntimeException, std::exception) +uno::Sequence< uno::Type > CreationWizardUnoDlg::getTypes() { static uno::Sequence< uno::Type > aTypeList; @@ -141,28 +138,28 @@ uno::Sequence< uno::Type > CreationWizardUnoDlg::getTypes() throw(uno::RuntimeEx return aTypeList; } -uno::Sequence< sal_Int8 > SAL_CALL CreationWizardUnoDlg::getImplementationId() throw( uno::RuntimeException, std::exception ) +uno::Sequence< sal_Int8 > SAL_CALL CreationWizardUnoDlg::getImplementationId() { return css::uno::Sequence(); } // XTerminateListener -void SAL_CALL CreationWizardUnoDlg::queryTermination( const lang::EventObject& /*Event*/ ) throw( frame::TerminationVetoException, uno::RuntimeException, std::exception) +void SAL_CALL CreationWizardUnoDlg::queryTermination( const lang::EventObject& /*Event*/ ) { } -void SAL_CALL CreationWizardUnoDlg::notifyTermination( const lang::EventObject& /*Event*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL CreationWizardUnoDlg::notifyTermination( const lang::EventObject& /*Event*/ ) { // we are going down, so dispose us! dispose(); } -void SAL_CALL CreationWizardUnoDlg::disposing( const lang::EventObject& /*Source*/ ) throw (uno::RuntimeException, std::exception) +void SAL_CALL CreationWizardUnoDlg::disposing( const lang::EventObject& /*Source*/ ) { //Listener should deregister himself and release all references to the closing object. } -void SAL_CALL CreationWizardUnoDlg::setTitle( const OUString& /*rTitle*/ ) throw(uno::RuntimeException, std::exception) +void SAL_CALL CreationWizardUnoDlg::setTitle( const OUString& /*rTitle*/ ) { } void CreationWizardUnoDlg::createDialogOnDemand() @@ -203,7 +200,7 @@ IMPL_LINK( CreationWizardUnoDlg, DialogEventHdl, VclWindowEvent&, rEvent, void ) m_pDialog = nullptr;//avoid duplicate destruction of m_pDialog } -sal_Int16 SAL_CALL CreationWizardUnoDlg::execute( ) throw(uno::RuntimeException, std::exception) +sal_Int16 SAL_CALL CreationWizardUnoDlg::execute( ) { sal_Int16 nRet = RET_CANCEL; { @@ -219,7 +216,7 @@ sal_Int16 SAL_CALL CreationWizardUnoDlg::execute( ) throw(uno::RuntimeException return nRet; } -void SAL_CALL CreationWizardUnoDlg::initialize( const uno::Sequence< uno::Any >& aArguments ) throw(uno::Exception, uno::RuntimeException, std::exception) +void SAL_CALL CreationWizardUnoDlg::initialize( const uno::Sequence< uno::Any >& aArguments ) { const uno::Any* pArguments = aArguments.getConstArray(); for(sal_Int32 i=0; i SAL_CALL CreationWizardUnoDlg::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); return nullptr; @@ -271,8 +267,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL CreationWizardUnoDlg::getProp void SAL_CALL CreationWizardUnoDlg::setPropertyValue( const OUString& rPropertyName , const uno::Any& rValue ) - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException - , lang::WrappedTargetException, uno::RuntimeException, std::exception) { if( rPropertyName == "Position" ) { @@ -307,7 +301,6 @@ void SAL_CALL CreationWizardUnoDlg::setPropertyValue( const OUString& rPropertyN } uno::Any SAL_CALL CreationWizardUnoDlg::getPropertyValue( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { uno::Any aRet; if( rPropertyName == "Position" ) @@ -347,25 +340,21 @@ uno::Any SAL_CALL CreationWizardUnoDlg::getPropertyValue( const OUString& rPrope void SAL_CALL CreationWizardUnoDlg::addPropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference< beans::XPropertyChangeListener >& /* xListener */ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL CreationWizardUnoDlg::removePropertyChangeListener( const OUString& /* aPropertyName */, const uno::Reference< beans::XPropertyChangeListener >& /* aListener */ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL CreationWizardUnoDlg::addVetoableChangeListener( const OUString& /* PropertyName */, const uno::Reference< beans::XVetoableChangeListener >& /* aListener */ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL CreationWizardUnoDlg::removeVetoableChangeListener( const OUString& /* PropertyName */, const uno::Reference< beans::XVetoableChangeListener >& /* aListener */ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } diff --git a/chart2/source/controller/inc/AccessibleBase.hxx b/chart2/source/controller/inc/AccessibleBase.hxx index 07416aef68b4..f20c14d3f71e 100644 --- a/chart2/source/controller/inc/AccessibleBase.hxx +++ b/chart2/source/controller/inc/AccessibleBase.hxx @@ -116,7 +116,7 @@ protected: false otherwise @throws css::lang::DisposedException */ - bool CheckDisposeState( bool bThrowException = true ) const throw (css::lang::DisposedException); + bool CheckDisposeState( bool bThrowException = true ) const; /** Events coming from the core have to be processed in this methods. The default implementation returns false, which indicates that the object is @@ -137,14 +137,14 @@ protected: @throws css::uno::RuntimeException */ - void AddState( sal_Int16 aState ) throw (css::uno::RuntimeException); + void AddState( sal_Int16 aState ); /** Removes a state from the set if the set contains the state, otherwise nothing is done. @throws css::uno::RuntimeException */ - void RemoveState( sal_Int16 aState ) throw (css::uno::RuntimeException); + void RemoveState( sal_Int16 aState ); /** has to be overridden by derived classes that support child elements. With this method a rescan is initiated that should result in a correct @@ -211,17 +211,14 @@ protected: @throws css::uno::RuntimeException */ virtual css::uno::Reference< css::accessibility::XAccessible > - ImplGetAccessibleChildById( sal_Int32 i ) const - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException); + ImplGetAccessibleChildById( sal_Int32 i ) const; /** Is called from getAccessibleChildCount(). Before this method is called, an update of children is done if necessary. @throws css::uno::RuntimeException */ - virtual sal_Int32 ImplGetAccessibleChildCount() const - throw (css::uno::RuntimeException); + virtual sal_Int32 ImplGetAccessibleChildCount() const; const AccessibleElementInfo& GetInfo() const { return m_aAccInfo;} void SetInfo( const AccessibleElementInfo & rNewInfo ); @@ -231,84 +228,58 @@ protected: virtual void SAL_CALL disposing() override; // ________ XAccessible ________ - virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::accessibility::XAccessibleContext > SAL_CALL getAccessibleContext() override; // ________ XAccessibleContext ________ - virtual sal_Int32 SAL_CALL getAccessibleChildCount() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getAccessibleChildCount() override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleChild( sal_Int32 i ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + getAccessibleChild( sal_Int32 i ) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleParent() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleParent() override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override; /// @return AccessibleRole.SHAPE - virtual sal_Int16 SAL_CALL getAccessibleRole() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL getAccessibleRole() override; // has to be implemented by derived classes // virtual OUString SAL_CALL getAccessibleName() // throw (css::uno::RuntimeException); virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL - getAccessibleRelationSet() - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleRelationSet() override; virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL - getAccessibleStateSet() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::lang::Locale SAL_CALL getLocale() - throw (css::accessibility::IllegalAccessibleComponentStateException, - css::uno::RuntimeException, std::exception) override; + getAccessibleStateSet() override; + virtual css::lang::Locale SAL_CALL getLocale() override; // has to be implemented by derived classes // virtual OUString SAL_CALL getAccessibleDescription() // throw (css::uno::RuntimeException); // ________ XAccessibleComponent ________ virtual sal_Bool SAL_CALL containsPoint( - const css::awt::Point& aPoint ) - throw (css::uno::RuntimeException, std::exception) override; + const css::awt::Point& aPoint ) override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL - getAccessibleAtPoint( const css::awt::Point& aPoint ) - throw (css::uno::RuntimeException, std::exception) override; + getAccessibleAtPoint( const css::awt::Point& aPoint ) override; // has to be defined in derived classes - virtual css::awt::Rectangle SAL_CALL getBounds() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Point SAL_CALL getLocation() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Point SAL_CALL getLocationOnScreen() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Size SAL_CALL getSize() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL grabFocus() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getForeground() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getBackground() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle SAL_CALL getBounds() override; + virtual css::awt::Point SAL_CALL getLocation() override; + virtual css::awt::Point SAL_CALL getLocationOnScreen() override; + virtual css::awt::Size SAL_CALL getSize() override; + virtual void SAL_CALL grabFocus() override; + virtual sal_Int32 SAL_CALL getForeground() override; + virtual sal_Int32 SAL_CALL getBackground() override; // ________ XServiceInfo ________ - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; virtual sal_Bool SAL_CALL supportsService( - const OUString& ServiceName ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // ________ XEventListener ________ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; // ________ XAccessibleEventBroadcaster ________ virtual void SAL_CALL addAccessibleEventListener( - const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override; virtual void SAL_CALL removeAccessibleEventListener( - const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::accessibility::XAccessibleEventListener >& xListener ) override; private: enum eColorType diff --git a/chart2/source/controller/inc/AccessibleChartView.hxx b/chart2/source/controller/inc/AccessibleChartView.hxx index a82fc8bd64f0..5fce27f6be09 100644 --- a/chart2/source/controller/inc/AccessibleChartView.hxx +++ b/chart2/source/controller/inc/AccessibleChartView.hxx @@ -73,31 +73,24 @@ public: // 4: awt::XWindow representing the view's window (is a vcl Window) // all arguments are only valid until next initialization - don't keep them longer virtual void SAL_CALL initialize( - const css::uno::Sequence< css::uno::Any >& aArguments ) - throw (css::uno::Exception, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Any >& aArguments ) override; // ____ view::XSelectionChangeListener ____ - virtual void SAL_CALL selectionChanged( const css::lang::EventObject& aEvent ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL selectionChanged( const css::lang::EventObject& aEvent ) override; // ________ XEventListener ________ - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; // ________ XAccessibleContext ________ - virtual OUString SAL_CALL getAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleName() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getAccessibleRole() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getAccessibleDescription() override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent() override; + virtual sal_Int32 SAL_CALL getAccessibleIndexInParent() override; + virtual OUString SAL_CALL getAccessibleName() override; + virtual sal_Int16 SAL_CALL getAccessibleRole() override; // ________ XAccessibleComponent ________ - virtual css::awt::Rectangle SAL_CALL getBounds() throw (css::uno::RuntimeException, std::exception) override; - virtual css::awt::Point SAL_CALL getLocationOnScreen() throw (css::uno::RuntimeException, std::exception) override; + virtual css::awt::Rectangle SAL_CALL getBounds() override; + virtual css::awt::Point SAL_CALL getLocationOnScreen() override; protected: // ________ AccessibleChartElement ________ diff --git a/chart2/source/controller/inc/AccessibleTextHelper.hxx b/chart2/source/controller/inc/AccessibleTextHelper.hxx index 27744de6d085..bd12ac349475 100644 --- a/chart2/source/controller/inc/AccessibleTextHelper.hxx +++ b/chart2/source/controller/inc/AccessibleTextHelper.hxx @@ -65,34 +65,20 @@ public: text currently. */ virtual void SAL_CALL initialize( - const css::uno::Sequence< css::uno::Any >& aArguments ) - throw (css::uno::Exception, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Any >& aArguments ) override; // ____ XAccessibleContext ____ - virtual ::sal_Int32 SAL_CALL getAccessibleChildCount() - throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getAccessibleChildCount() override; virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleChild( - ::sal_Int32 i ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent() - throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getAccessibleIndexInParent() - throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int16 SAL_CALL getAccessibleRole() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleDescription() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getAccessibleName() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::lang::Locale SAL_CALL getLocale() - throw (css::accessibility::IllegalAccessibleComponentStateException, - css::uno::RuntimeException, std::exception) override; + ::sal_Int32 i ) override; + virtual css::uno::Reference< css::accessibility::XAccessible > SAL_CALL getAccessibleParent() override; + virtual ::sal_Int32 SAL_CALL getAccessibleIndexInParent() override; + virtual ::sal_Int16 SAL_CALL getAccessibleRole() override; + virtual OUString SAL_CALL getAccessibleDescription() override; + virtual OUString SAL_CALL getAccessibleName() override; + virtual css::uno::Reference< css::accessibility::XAccessibleRelationSet > SAL_CALL getAccessibleRelationSet() override; + virtual css::uno::Reference< css::accessibility::XAccessibleStateSet > SAL_CALL getAccessibleStateSet() override; + virtual css::lang::Locale SAL_CALL getLocale() override; private: std::unique_ptr<::accessibility::AccessibleTextHelper> m_pTextHelper; diff --git a/chart2/source/controller/inc/AxisItemConverter.hxx b/chart2/source/controller/inc/AxisItemConverter.hxx index ab787002a155..24a7e412ab87 100644 --- a/chart2/source/controller/inc/AxisItemConverter.hxx +++ b/chart2/source/controller/inc/AxisItemConverter.hxx @@ -52,10 +52,8 @@ protected: virtual const sal_uInt16 * GetWhichPairs() const override; virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override; - virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( css::uno::Exception ) override; - virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( css::uno::Exception ) override; + virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override; + virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override; private: ::std::vector< ItemConverter * > m_aConverters; diff --git a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx index 82615553a34d..5c21d43c9365 100644 --- a/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx +++ b/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx @@ -46,10 +46,8 @@ public: protected: virtual const sal_uInt16* GetWhichPairs() const override; virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override; - virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw (css::uno::Exception) override; - virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw (css::uno::Exception) override; + virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override; + virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override; const css::uno::Reference& GetRefSizePropertySet() const; diff --git a/chart2/source/controller/inc/ChartController.hxx b/chart2/source/controller/inc/ChartController.hxx index eb2ba8857696..40b31bc6ec00 100644 --- a/chart2/source/controller/inc/ChartController.hxx +++ b/chart2/source/controller/inc/ChartController.hxx @@ -112,225 +112,175 @@ public: OUString GetContextName(); // css::lang::XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // css::frame::XController (required interface) virtual void SAL_CALL - attachFrame( const css::uno::Reference< css::frame::XFrame > & xFrame ) - throw (css::uno::RuntimeException, std::exception) override; + attachFrame( const css::uno::Reference< css::frame::XFrame > & xFrame ) override; virtual sal_Bool SAL_CALL - attachModel( const css::uno::Reference< css::frame::XModel > & xModel ) - throw (css::uno::RuntimeException, std::exception) override; + attachModel( const css::uno::Reference< css::frame::XModel > & xModel ) override; virtual css::uno::Reference< css::frame::XFrame > SAL_CALL - getFrame() throw (css::uno::RuntimeException, std::exception) override; + getFrame() override; virtual css::uno::Reference< css::frame::XModel > SAL_CALL - getModel() throw (css::uno::RuntimeException, std::exception) override; + getModel() override; virtual css::uno::Any SAL_CALL - getViewData() throw (css::uno::RuntimeException, std::exception) override; + getViewData() override; virtual void SAL_CALL - restoreViewData( const css::uno::Any& rValue ) - throw (css::uno::RuntimeException, std::exception) override; + restoreViewData( const css::uno::Any& rValue ) override; virtual sal_Bool SAL_CALL - suspend( sal_Bool bSuspend ) - throw (css::uno::RuntimeException, std::exception) override; + suspend( sal_Bool bSuspend ) override; // css::lang::XComponent (base of XController) virtual void SAL_CALL - dispose() throw (css::uno::RuntimeException, std::exception) override; + dispose() override; virtual void SAL_CALL - addEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) - throw (css::uno::RuntimeException, std::exception) override; + addEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) override; virtual void SAL_CALL - removeEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) - throw (css::uno::RuntimeException, std::exception) override; + removeEventListener( const css::uno::Reference< css::lang::XEventListener > & xListener ) override; // css::frame::XDispatchProvider (required interface) virtual css::uno::Reference< css::frame::XDispatch> SAL_CALL queryDispatch( const css::util::URL& rURL , const OUString& rTargetFrameName - , sal_Int32 nSearchFlags) - throw (css::uno::RuntimeException, std::exception) override; + , sal_Int32 nSearchFlags) override; virtual css::uno::Sequence< css::uno::Reference< css::frame::XDispatch > > SAL_CALL - queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor > & xDescripts) - throw (css::uno::RuntimeException, std::exception) override; + queryDispatches( const css::uno::Sequence< css::frame::DispatchDescriptor > & xDescripts) override; // css::view::XSelectionSupplier (optional interface) virtual sal_Bool SAL_CALL - select( const css::uno::Any& rSelection ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + select( const css::uno::Any& rSelection ) override; virtual css::uno::Any SAL_CALL - getSelection() throw (css::uno::RuntimeException, std::exception) override; + getSelection() override; virtual void SAL_CALL - addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener > & xListener ) - throw (css::uno::RuntimeException, std::exception) override; + addSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener > & xListener ) override; virtual void SAL_CALL - removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener > & xListener ) - throw (css::uno::RuntimeException, std::exception) override; + removeSelectionChangeListener( const css::uno::Reference< css::view::XSelectionChangeListener > & xListener ) override; // css::ui::XContextMenuInterception (optional interface) virtual void SAL_CALL - registerContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor > & xInterceptor) - throw (css::uno::RuntimeException, std::exception) override; + registerContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor > & xInterceptor) override; virtual void SAL_CALL - releaseContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor > & xInterceptor) - throw (css::uno::RuntimeException, std::exception) override; + releaseContextMenuInterceptor( const css::uno::Reference< css::ui::XContextMenuInterceptor > & xInterceptor) override; //additional interfaces // css::util::XCloseListener virtual void SAL_CALL queryClosing( const css::lang::EventObject& Source - , sal_Bool GetsOwnership ) - throw (css::util::CloseVetoException - , css::uno::RuntimeException, std::exception) override; + , sal_Bool GetsOwnership ) override; virtual void SAL_CALL - notifyClosing( const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + notifyClosing( const css::lang::EventObject& Source ) override; // css::util::XEventListener (base of XCloseListener and XModifyListener) virtual void SAL_CALL - disposing( const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + disposing( const css::lang::EventObject& Source ) override; // css::frame::XDispatch virtual void SAL_CALL dispatch( const css::util::URL& aURL - , const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) - throw (css::uno::RuntimeException, - std::exception) override; + , const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) override; virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl - , const css::util::URL& aURL ) - throw (css::uno::RuntimeException, std::exception) override; + , const css::util::URL& aURL ) override; virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& xControl - , const css::util::URL& aURL ) - throw (css::uno::RuntimeException, std::exception) override; + , const css::util::URL& aURL ) override; // css::awt::XWindow virtual void SAL_CALL setPosSize( sal_Int32 X, sal_Int32 Y - , sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) - throw (css::uno::RuntimeException, std::exception) override; + , sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) override; virtual css::awt::Rectangle SAL_CALL - getPosSize() - throw (css::uno::RuntimeException, std::exception) override; + getPosSize() override; virtual void SAL_CALL - setVisible( sal_Bool Visible ) - throw (css::uno::RuntimeException, std::exception) override; + setVisible( sal_Bool Visible ) override; virtual void SAL_CALL - setEnable( sal_Bool Enable ) - throw (css::uno::RuntimeException, std::exception) override; + setEnable( sal_Bool Enable ) override; virtual void SAL_CALL - setFocus() throw (css::uno::RuntimeException, std::exception) override; + setFocus() override; virtual void SAL_CALL - addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + addWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override; virtual void SAL_CALL - removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + removeWindowListener( const css::uno::Reference< css::awt::XWindowListener >& xListener ) override; virtual void SAL_CALL - addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + addFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override; virtual void SAL_CALL - removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + removeFocusListener( const css::uno::Reference< css::awt::XFocusListener >& xListener ) override; virtual void SAL_CALL - addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + addKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override; virtual void SAL_CALL - removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + removeKeyListener( const css::uno::Reference< css::awt::XKeyListener >& xListener ) override; virtual void SAL_CALL - addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + addMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override; virtual void SAL_CALL - removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + removeMouseListener( const css::uno::Reference< css::awt::XMouseListener >& xListener ) override; virtual void SAL_CALL - addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + addMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override; virtual void SAL_CALL - removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + removeMouseMotionListener( const css::uno::Reference< css::awt::XMouseMotionListener >& xListener ) override; virtual void SAL_CALL - addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + addPaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override; virtual void SAL_CALL - removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + removePaintListener( const css::uno::Reference< css::awt::XPaintListener >& xListener ) override; // css::lang XMultiServiceFactory virtual css::uno::Reference< css::uno::XInterface > SAL_CALL - createInstance( const OUString& aServiceSpecifier ) - throw (css::uno::Exception, - css::uno::RuntimeException, std::exception) override; + createInstance( const OUString& aServiceSpecifier ) override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, const css::uno::Sequence< - css::uno::Any >& Arguments ) - throw (css::uno::Exception, - css::uno::RuntimeException, std::exception) override; + css::uno::Any >& Arguments ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getAvailableServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getAvailableServiceNames() override; // css::util::XModifyListener virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // css::util::XModeChangeListener virtual void SAL_CALL modeChanged( - const css::util::ModeChangeEvent& _rSource ) - throw (css::uno::RuntimeException, - std::exception) override; + const css::util::ModeChangeEvent& _rSource ) override; // css::frame::XLayoutManagerListener virtual void SAL_CALL layoutEvent( const css::lang::EventObject& aSource, ::sal_Int16 eLayoutEvent, - const css::uno::Any& aInfo ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Any& aInfo ) override; // WindowController stuff void PrePaint(vcl::RenderContext& rRenderContext); diff --git a/chart2/source/controller/inc/ChartDocumentWrapper.hxx b/chart2/source/controller/inc/ChartDocumentWrapper.hxx index 3cf3aa7a8f99..eacf8d011936 100644 --- a/chart2/source/controller/inc/ChartDocumentWrapper.hxx +++ b/chart2/source/controller/inc/ChartDocumentWrapper.hxx @@ -62,12 +62,9 @@ public: virtual ~ChartDocumentWrapper() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; void setAddIn( const css::uno::Reference< css::util::XRefreshable >& xAddIn ); const css::uno::Reference< css::util::XRefreshable >& getAddIn() const { return m_xAddIn;} @@ -81,98 +78,65 @@ public: css::uno::Reference< css::drawing::XShapes > getAdditionalShapes() const; /// @throws css::uno::RuntimeException - css::uno::Reference< css::drawing::XDrawPage > impl_getDrawPage() const - throw (css::uno::RuntimeException); + css::uno::Reference< css::drawing::XDrawPage > impl_getDrawPage() const; protected: // ____ chart::XChartDocument ____ - virtual css::uno::Reference< css::drawing::XShape > SAL_CALL getTitle() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::drawing::XShape > SAL_CALL getSubTitle() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::drawing::XShape > SAL_CALL getLegend() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getArea() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::chart::XDiagram > SAL_CALL getDiagram() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XShape > SAL_CALL getTitle() override; + virtual css::uno::Reference< css::drawing::XShape > SAL_CALL getSubTitle() override; + virtual css::uno::Reference< css::drawing::XShape > SAL_CALL getLegend() override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getArea() override; + virtual css::uno::Reference< css::chart::XDiagram > SAL_CALL getDiagram() override; virtual void SAL_CALL setDiagram( const css::uno::Reference< - css::chart::XDiagram >& xDiagram ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::chart::XChartData > SAL_CALL getData() - throw (css::uno::RuntimeException, std::exception) override; + css::chart::XDiagram >& xDiagram ) override; + virtual css::uno::Reference< css::chart::XChartData > SAL_CALL getData() override; virtual void SAL_CALL attachData( const css::uno::Reference< - css::chart::XChartData >& xData ) - throw (css::uno::RuntimeException, std::exception) override; + css::chart::XChartData >& xData ) override; // ____ XModel ____ virtual sal_Bool SAL_CALL attachResource( const OUString& URL, - const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getURL() - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override; + virtual OUString SAL_CALL getURL() override; virtual css::uno::Sequence< - css::beans::PropertyValue > SAL_CALL getArgs() - throw (css::uno::RuntimeException, std::exception) override; + css::beans::PropertyValue > SAL_CALL getArgs() override; virtual void SAL_CALL connectController( const css::uno::Reference< - css::frame::XController >& Controller ) - throw (css::uno::RuntimeException, std::exception) override; + css::frame::XController >& Controller ) override; virtual void SAL_CALL disconnectController( const css::uno::Reference< - css::frame::XController >& Controller ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL lockControllers() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL unlockControllers() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasControllersLocked() - throw (css::uno::RuntimeException, std::exception) override; + css::frame::XController >& Controller ) override; + virtual void SAL_CALL lockControllers() override; + virtual void SAL_CALL unlockControllers() override; + virtual sal_Bool SAL_CALL hasControllersLocked() override; virtual css::uno::Reference< - css::frame::XController > SAL_CALL getCurrentController() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCurrentController( const css::uno::Reference< css::frame::XController >& Controller ) - throw (css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference SAL_CALL getCurrentSelection() - throw (css::uno::RuntimeException, std::exception) override; + css::frame::XController > SAL_CALL getCurrentController() override; + virtual void SAL_CALL setCurrentController( const css::uno::Reference< css::frame::XController >& Controller ) override; + virtual css::uno::Reference SAL_CALL getCurrentSelection() override; // ____ XComponent ____ - virtual void SAL_CALL dispose() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; // ____ XInterface (for new interfaces) ____ - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; // ____ ::utl::OEventListenerAdapter ____ virtual void _disposing( const css::lang::EventObject& rSource ) override; // ____ XDrawPageSupplier ____ - virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getDrawPage() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::drawing::XDrawPage > SAL_CALL getDrawPage() override; // ____ XMultiServiceFactory ____ - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) - throw (css::uno::Exception, - css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, - const css::uno::Sequence< css::uno::Any >& Arguments ) - throw (css::uno::Exception, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Any >& Arguments ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() override; // ____ XAggregation ____ virtual void SAL_CALL setDelegator( - const css::uno::Reference< css::uno::XInterface >& rDelegator ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::uno::XInterface >& rDelegator ) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& aType ) override; // ____ WrappedPropertySet ____ virtual const css::uno::Sequence< css::beans::Property >& getPropertySequence() override; diff --git a/chart2/source/controller/inc/ChartToolbarController.hxx b/chart2/source/controller/inc/ChartToolbarController.hxx index 7a11bc5880fa..ad7d45ef5ba7 100644 --- a/chart2/source/controller/inc/ChartToolbarController.hxx +++ b/chart2/source/controller/inc/ChartToolbarController.hxx @@ -39,47 +39,35 @@ public: const ChartToolbarController& operator=(const ChartToolbarController&) = delete; // XToolbarContoller - virtual void SAL_CALL execute(sal_Int16 nKeyModifier) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL execute(sal_Int16 nKeyModifier) override; - virtual void SAL_CALL click() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL click() override; - virtual void SAL_CALL doubleClick() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL doubleClick() override; - virtual css::uno::Reference SAL_CALL createPopupWindow() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference SAL_CALL createPopupWindow() override; virtual css::uno::Reference SAL_CALL - createItemWindow(const css::uno::Reference& rParent) - throw (css::uno::RuntimeException, std::exception) override; + createItemWindow(const css::uno::Reference& rParent) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override; - virtual css::uno::Sequence SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence SAL_CALL getSupportedServiceNames() override; // XStatusListener - virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& rEvent) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL statusChanged(const css::frame::FeatureStateEvent& rEvent) override; // XEventListener - virtual void SAL_CALL disposing(const css::lang::EventObject& rSource) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& rSource) override; // XInitialization - virtual void SAL_CALL initialize(const css::uno::Sequence& rAny) - throw (css::uno::Exception, std::exception) override; + virtual void SAL_CALL initialize(const css::uno::Sequence& rAny) override; // XUpdatable - virtual void SAL_CALL update() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL update() override; using cppu::WeakComponentImplHelperBase::disposing; diff --git a/chart2/source/controller/inc/DataPointItemConverter.hxx b/chart2/source/controller/inc/DataPointItemConverter.hxx index e510748590f7..030a42f65dde 100644 --- a/chart2/source/controller/inc/DataPointItemConverter.hxx +++ b/chart2/source/controller/inc/DataPointItemConverter.hxx @@ -63,10 +63,8 @@ protected: virtual const sal_uInt16 * GetWhichPairs() const override; virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override; - virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw (css::uno::Exception) override; - virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw (css::uno::Exception) override; + virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override; + virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override; private: ::std::vector< ItemConverter * > m_aConverters; diff --git a/chart2/source/controller/inc/ErrorBarItemConverter.hxx b/chart2/source/controller/inc/ErrorBarItemConverter.hxx index 49491161b937..9c6990c8cfbb 100644 --- a/chart2/source/controller/inc/ErrorBarItemConverter.hxx +++ b/chart2/source/controller/inc/ErrorBarItemConverter.hxx @@ -55,10 +55,8 @@ protected: virtual const sal_uInt16 * GetWhichPairs() const override; virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override; - virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( css::uno::Exception ) override; - virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( css::uno::Exception ) override; + virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override; + virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override; private: std::shared_ptr< ItemConverter > m_spGraphicConverter; diff --git a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx index 01f8012ef74b..0fafd00d6706 100644 --- a/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx +++ b/chart2/source/controller/inc/GraphicPropertyItemConverter.hxx @@ -54,10 +54,8 @@ protected: virtual const sal_uInt16 * GetWhichPairs() const override; virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override; - virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw (css::uno::Exception, std::exception) override; - virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( css::uno::Exception ) override; + virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override; + virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override; private: eGraphicObjectType m_eGraphicObjectType; diff --git a/chart2/source/controller/inc/ItemConverter.hxx b/chart2/source/controller/inc/ItemConverter.hxx index 5763318669eb..2ddbab146bc2 100644 --- a/chart2/source/controller/inc/ItemConverter.hxx +++ b/chart2/source/controller/inc/ItemConverter.hxx @@ -148,8 +148,7 @@ protected: @throws css::uno::Exception */ - virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw (css::uno::Exception, std::exception); + virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const; /** for items that can not be mapped directly to a property. @@ -162,8 +161,7 @@ protected: @throws css::uno::Exception */ - virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( css::uno::Exception ); + virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ); /// Returns the pool SfxItemPool & GetItemPool() const { return m_rItemPool;} diff --git a/chart2/source/controller/inc/LegendItemConverter.hxx b/chart2/source/controller/inc/LegendItemConverter.hxx index aa86a2889627..794fd1733cd8 100644 --- a/chart2/source/controller/inc/LegendItemConverter.hxx +++ b/chart2/source/controller/inc/LegendItemConverter.hxx @@ -51,10 +51,8 @@ protected: virtual const sal_uInt16 * GetWhichPairs() const override; virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override; - virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( css::uno::Exception ) override; - virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( css::uno::Exception ) override; + virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override; + virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override; private: ::std::vector< ItemConverter * > m_aConverters; diff --git a/chart2/source/controller/inc/RangeSelectionListener.hxx b/chart2/source/controller/inc/RangeSelectionListener.hxx index c0b96e63ee10..dcd1d7f6a5a5 100644 --- a/chart2/source/controller/inc/RangeSelectionListener.hxx +++ b/chart2/source/controller/inc/RangeSelectionListener.hxx @@ -50,14 +50,11 @@ public: protected: // ____ XRangeSelectionListener ____ - virtual void SAL_CALL done( const css::sheet::RangeSelectionEvent& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL aborted( const css::sheet::RangeSelectionEvent& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL done( const css::sheet::RangeSelectionEvent& aEvent ) override; + virtual void SAL_CALL aborted( const css::sheet::RangeSelectionEvent& aEvent ) override; // ____ XEventListener ____ - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; private: RangeSelectionListenerParent & m_rParent; diff --git a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx index 66b09a51e97b..c61489a45ee5 100644 --- a/chart2/source/controller/inc/RegressionCurveItemConverter.hxx +++ b/chart2/source/controller/inc/RegressionCurveItemConverter.hxx @@ -52,10 +52,8 @@ protected: virtual const sal_uInt16 * GetWhichPairs() const override; virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override; - virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( css::uno::Exception ) override; - virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( css::uno::Exception ) override; + virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override; + virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override; private: std::shared_ptr< ItemConverter > m_spGraphicConverter; diff --git a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx index 78a30541a579..03eaadd967b9 100644 --- a/chart2/source/controller/inc/RegressionEquationItemConverter.hxx +++ b/chart2/source/controller/inc/RegressionEquationItemConverter.hxx @@ -51,10 +51,8 @@ protected: virtual const sal_uInt16 * GetWhichPairs() const override; virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override; - virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( css::uno::Exception ) override; - virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( css::uno::Exception ) override; + virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override; + virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override; private: ::std::vector< ItemConverter * > m_aConverters; diff --git a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx index 93550a6f4182..dd313a08de55 100644 --- a/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx +++ b/chart2/source/controller/inc/SeriesOptionsItemConverter.hxx @@ -44,10 +44,8 @@ protected: virtual const sal_uInt16 * GetWhichPairs() const override; virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override; - virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( css::uno::Exception ) override; - virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( css::uno::Exception ) override; + virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override; + virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override; private: css::uno::Reference< css::frame::XModel > m_xChartModel; diff --git a/chart2/source/controller/inc/StatisticsItemConverter.hxx b/chart2/source/controller/inc/StatisticsItemConverter.hxx index 86fb64566888..25897e34d0e0 100644 --- a/chart2/source/controller/inc/StatisticsItemConverter.hxx +++ b/chart2/source/controller/inc/StatisticsItemConverter.hxx @@ -45,10 +45,8 @@ protected: virtual const sal_uInt16 * GetWhichPairs() const override; virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override; - virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( css::uno::Exception ) override; - virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( css::uno::Exception ) override; + virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override; + virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override; private: css::uno::Reference< css::frame::XModel > m_xModel; diff --git a/chart2/source/controller/inc/TextLabelItemConverter.hxx b/chart2/source/controller/inc/TextLabelItemConverter.hxx index e89269fda315..3d13cc354f65 100644 --- a/chart2/source/controller/inc/TextLabelItemConverter.hxx +++ b/chart2/source/controller/inc/TextLabelItemConverter.hxx @@ -51,10 +51,8 @@ protected: virtual const sal_uInt16* GetWhichPairs() const override; virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override; - virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw (css::uno::Exception) override; - virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw (css::uno::Exception) override; + virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override; + virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override; private: std::vector maConverters; diff --git a/chart2/source/controller/inc/TitleItemConverter.hxx b/chart2/source/controller/inc/TitleItemConverter.hxx index 6671c57ee4e5..fde086ec12c9 100644 --- a/chart2/source/controller/inc/TitleItemConverter.hxx +++ b/chart2/source/controller/inc/TitleItemConverter.hxx @@ -47,10 +47,8 @@ protected: virtual const sal_uInt16 * GetWhichPairs() const override; virtual bool GetItemProperty( tWhichIdType nWhichId, tPropertyNameWithMemberId & rOutProperty ) const override; - virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw (css::uno::Exception) override; - virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw (css::uno::Exception) override; + virtual void FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const override; + virtual bool ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) override; private: ::std::vector< ItemConverter * > m_aConverters; diff --git a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx index 826948c09697..76f7a15d790c 100644 --- a/chart2/source/controller/inc/dlg_ChartType_UNO.hxx +++ b/chart2/source/controller/inc/dlg_ChartType_UNO.hxx @@ -44,13 +44,13 @@ private: virtual VclPtr createDialog(vcl::Window* _pParent) override; // XTypeProvider - virtual css::uno::Sequence SAL_CALL getImplementationId( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence SAL_CALL getImplementationId( ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence SAL_CALL getSupportedServiceNames() override; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo> SAL_CALL getPropertySetInfo() override; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // OPropertyArrayUsageHelper diff --git a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx index 2c2684127065..7d08d0e6e502 100644 --- a/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx +++ b/chart2/source/controller/inc/dlg_CreationWizard_UNO.hxx @@ -53,44 +53,41 @@ public: virtual ~CreationWizardUnoDlg() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; + virtual css::uno::Any SAL_CALL queryAggregation( css::uno::Type const & rType ) override; virtual void SAL_CALL acquire() throw () override; virtual void SAL_CALL release() throw () override; // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId( ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XExecutableDialog - virtual void SAL_CALL setTitle( const OUString& aTitle ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL execute( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setTitle( const OUString& aTitle ) override; + virtual sal_Int16 SAL_CALL execute( ) override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XTerminateListener - virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) throw (css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) override; + virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) override; - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; //XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; DECL_LINK( DialogEventHdl, VclWindowEvent&, void ); diff --git a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx index 2ad5d630d917..fbb79d052b49 100644 --- a/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/AxisItemConverter.cxx @@ -160,7 +160,6 @@ bool lcl_hasTimeIntervalValue( const uno::Any& rAny ) } void AxisItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( uno::Exception ) { if( !m_xAxis.is() ) return; @@ -462,7 +461,6 @@ bool lcl_isAutoMinor( const SfxItemSet & rItemSet ) } bool AxisItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( uno::Exception ) { if( !m_xAxis.is() ) return false; diff --git a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx index ed16e0a501fa..503a588061dc 100644 --- a/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx @@ -107,7 +107,6 @@ bool CharacterPropertyItemConverter::GetItemProperty( tWhichIdType nWhichId, tPr void CharacterPropertyItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( uno::Exception ) { switch( nWhichId ) { @@ -307,7 +306,6 @@ void CharacterPropertyItemConverter::FillSpecialItem( bool CharacterPropertyItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( uno::Exception ) { bool bChanged = false; uno::Any aValue; diff --git a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx index 9f4ce523e8ec..6fc7aef87ba3 100644 --- a/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/DataPointItemConverter.cxx @@ -288,7 +288,6 @@ bool DataPointItemConverter::GetItemProperty( tWhichIdType nWhichId, tPropertyNa bool DataPointItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( uno::Exception ) { bool bChanged = false; @@ -548,7 +547,6 @@ bool DataPointItemConverter::ApplySpecialItem( void DataPointItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( uno::Exception ) { switch( nWhichId ) { diff --git a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx index d5cc3ada524b..d92889b596ad 100644 --- a/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/ErrorBarItemConverter.cxx @@ -138,7 +138,6 @@ bool ErrorBarItemConverter::GetItemProperty( bool ErrorBarItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( uno::Exception ) { bool bChanged = false; @@ -331,7 +330,6 @@ bool ErrorBarItemConverter::ApplySpecialItem( void ErrorBarItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( uno::Exception ) { switch( nWhichId ) { diff --git a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx index 463269467c9c..dffa2cde9337 100644 --- a/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/GraphicPropertyItemConverter.cxx @@ -222,7 +222,6 @@ bool GraphicPropertyItemConverter::GetItemProperty( tWhichIdType nWhichId, tProp void GraphicPropertyItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw (uno::Exception, std::exception) { switch( nWhichId ) { @@ -432,7 +431,6 @@ void GraphicPropertyItemConverter::FillSpecialItem( bool GraphicPropertyItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( uno::Exception ) { bool bChanged = false; uno::Any aValue; diff --git a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx index 20746e7b3c1a..c889873d751f 100644 --- a/chart2/source/controller/itemsetwrapper/ItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/ItemConverter.cxx @@ -152,14 +152,12 @@ void ItemConverter::FillItemSet( SfxItemSet & rOutItemSet ) const void ItemConverter::FillSpecialItem( sal_uInt16 /*nWhichId*/, SfxItemSet & /*rOutItemSet*/ ) const - throw (uno::Exception, std::exception) { OSL_FAIL( "ItemConverter: Unhandled special item found!" ); } bool ItemConverter::ApplySpecialItem( sal_uInt16 /*nWhichId*/, const SfxItemSet & /*rItemSet*/ ) - throw( uno::Exception ) { OSL_FAIL( "ItemConverter: Unhandled special item found!" ); return false; diff --git a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx index 396d5425a6a6..6a7969639c40 100644 --- a/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/LegendItemConverter.cxx @@ -95,7 +95,6 @@ bool LegendItemConverter::GetItemProperty( tWhichIdType /*nWhichId*/, tPropertyN } bool LegendItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet& rInItemSet ) - throw( uno::Exception ) { bool bChanged = false; @@ -166,7 +165,6 @@ bool LegendItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSe void LegendItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( uno::Exception ) { switch( nWhichId ) { diff --git a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx index 773d24e443b2..f946b3b179c9 100644 --- a/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/RegressionCurveItemConverter.cxx @@ -138,7 +138,6 @@ bool RegressionCurveItemConverter::GetItemProperty( bool RegressionCurveItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( uno::Exception ) { uno::Reference< chart2::XRegressionCurve > xCurve( GetPropertySet(), uno::UNO_QUERY ); bool bChanged = false; @@ -254,7 +253,6 @@ bool RegressionCurveItemConverter::ApplySpecialItem( } void RegressionCurveItemConverter::FillSpecialItem(sal_uInt16 nWhichId, SfxItemSet& rOutItemSet ) const - throw( uno::Exception ) { uno::Reference xCurve(GetPropertySet(), uno::UNO_QUERY); OSL_ASSERT(xCurve.is()); diff --git a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx index 1047923c80dd..1ba39b2ea907 100644 --- a/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/RegressionEquationItemConverter.cxx @@ -110,7 +110,6 @@ bool RegressionEquationItemConverter::GetItemProperty( tWhichIdType nWhichId, tP bool RegressionEquationItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( uno::Exception ) { bool bChanged = false; @@ -135,7 +134,6 @@ bool RegressionEquationItemConverter::ApplySpecialItem( void RegressionEquationItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( uno::Exception ) { switch( nWhichId ) { diff --git a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx index 48ecfda6250e..61efffaeeb1b 100644 --- a/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/SeriesOptionsItemConverter.cxx @@ -180,7 +180,6 @@ bool SeriesOptionsItemConverter::GetItemProperty( tWhichIdType /*nWhichId*/, tPr } bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( uno::Exception ) { bool bChanged = false; switch( nWhichId ) @@ -359,7 +358,6 @@ bool SeriesOptionsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const Sf void SeriesOptionsItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( uno::Exception ) { switch( nWhichId ) { diff --git a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx index 433b736fba40..15a8aa7c39fc 100644 --- a/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/StatisticsItemConverter.cxx @@ -251,7 +251,6 @@ bool StatisticsItemConverter::GetItemProperty( bool StatisticsItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( uno::Exception ) { bool bChanged = false; @@ -615,7 +614,6 @@ bool StatisticsItemConverter::ApplySpecialItem( void StatisticsItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( uno::Exception ) { switch( nWhichId ) { diff --git a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx index 69251ca802ee..1e7abf646beb 100644 --- a/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/TextLabelItemConverter.cxx @@ -251,7 +251,6 @@ bool TextLabelItemConverter::GetItemProperty( tWhichIdType nWhichId, tPropertyNa } bool TextLabelItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet& rItemSet ) - throw (uno::Exception) { bool bChanged = false; @@ -500,7 +499,6 @@ bool TextLabelItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxIte } void TextLabelItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet& rOutItemSet ) const - throw (uno::Exception) { switch (nWhichId) { diff --git a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx index 91d8e36edf01..79dcffcf1f2e 100644 --- a/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx +++ b/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx @@ -161,7 +161,6 @@ bool TitleItemConverter::GetItemProperty( tWhichIdType nWhichId, tPropertyNameWi bool TitleItemConverter::ApplySpecialItem( sal_uInt16 nWhichId, const SfxItemSet & rItemSet ) - throw( uno::Exception ) { bool bChanged = false; @@ -191,7 +190,6 @@ bool TitleItemConverter::ApplySpecialItem( void TitleItemConverter::FillSpecialItem( sal_uInt16 nWhichId, SfxItemSet & rOutItemSet ) const - throw( uno::Exception ) { switch( nWhichId ) { diff --git a/chart2/source/controller/main/ChartController.cxx b/chart2/source/controller/main/ChartController.cxx index 2067180cb258..f9a5d76b7bde 100644 --- a/chart2/source/controller/main/ChartController.cxx +++ b/chart2/source/controller/main/ChartController.cxx @@ -341,19 +341,16 @@ bool ChartController::impl_isDisposedOrSuspended() const // lang::XServiceInfo OUString SAL_CALL ChartController::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString(CHART_CONTROLLER_SERVICE_IMPLEMENTATION_NAME); } sal_Bool SAL_CALL ChartController::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL ChartController::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CHART_CONTROLLER_SERVICE_NAME, @@ -393,7 +390,6 @@ uno::Reference getSidebarFromModel(const uno::Reference& xFrame ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -508,7 +504,6 @@ void SAL_CALL ChartController::attachFrame( //XModeChangeListener void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent ) - throw (uno::RuntimeException, std::exception) { //adjust controller to view status changes @@ -572,7 +567,6 @@ void SAL_CALL ChartController::modeChanged( const util::ModeChangeEvent& rEvent } sal_Bool SAL_CALL ChartController::attachModel( const uno::Reference< frame::XModel > & xModel ) - throw(uno::RuntimeException, std::exception) { impl_invalidateAccessible(); @@ -661,7 +655,6 @@ sal_Bool SAL_CALL ChartController::attachModel( const uno::Reference< frame::XMo } uno::Reference< frame::XFrame > SAL_CALL ChartController::getFrame() - throw(uno::RuntimeException, std::exception) { //provides access to owner frame of this controller //return the frame containing this controller @@ -670,7 +663,6 @@ uno::Reference< frame::XFrame > SAL_CALL ChartController::getFrame() } uno::Reference< frame::XModel > SAL_CALL ChartController::getModel() - throw(uno::RuntimeException, std::exception) { //provides access to currently attached model //returns the currently attached model @@ -684,7 +676,6 @@ uno::Reference< frame::XModel > SAL_CALL ChartController::getModel() } uno::Any SAL_CALL ChartController::getViewData() - throw(uno::RuntimeException, std::exception) { //provides access to current view status //set of data that can be used to restore the current view status at later time @@ -703,7 +694,6 @@ uno::Any SAL_CALL ChartController::getViewData() void SAL_CALL ChartController::restoreViewData( const uno::Any& /* Value */ ) - throw(uno::RuntimeException, std::exception) { //restores the view status using the data gotten from a previous call to XController::getViewData() @@ -715,7 +705,6 @@ void SAL_CALL ChartController::restoreViewData( } sal_Bool SAL_CALL ChartController::suspend( sal_Bool bSuspend ) - throw(uno::RuntimeException, std::exception) { //is called to prepare the controller for closing the view //bSuspend==true: force the controller to suspend his work @@ -774,7 +763,6 @@ void ChartController::impl_deleteDrawViewController() // XComponent (base of XController) void SAL_CALL ChartController::dispose() - throw(uno::RuntimeException, std::exception) { m_bDisposed = true; @@ -892,7 +880,6 @@ void SAL_CALL ChartController::dispose() void SAL_CALL ChartController::addEventListener( const uno::Reference& xListener ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if( impl_isDisposedOrSuspended() )//@todo? allow adding of listeners in suspend mode? @@ -904,7 +891,6 @@ void SAL_CALL ChartController::addEventListener( void SAL_CALL ChartController::removeEventListener( const uno::Reference& xListener ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if( m_aLifeTimeManager.impl_isDisposed(false) ) @@ -918,7 +904,6 @@ void SAL_CALL ChartController::removeEventListener( void SAL_CALL ChartController::queryClosing( const lang::EventObject& rSource, sal_Bool /*bGetsOwnership*/ ) - throw(util::CloseVetoException, uno::RuntimeException, std::exception) { //do not use the m_aControllerMutex here because this call is not allowed to block @@ -938,7 +923,6 @@ void SAL_CALL ChartController::queryClosing( void SAL_CALL ChartController::notifyClosing( const lang::EventObject& rSource ) - throw(uno::RuntimeException, std::exception) { //Listener should deregister himself and release all references to the closing object. @@ -990,7 +974,6 @@ bool ChartController::impl_releaseThisModel( // util::XEventListener (base of XCloseListener) void SAL_CALL ChartController::disposing( const lang::EventObject& rSource ) - throw(uno::RuntimeException, std::exception) { if( !impl_releaseThisModel( rSource.Source )) { @@ -1003,7 +986,6 @@ void SAL_CALL ChartController::layoutEvent( const lang::EventObject& aSource, sal_Int16 eLayoutEvent, const uno::Any& /* aInfo */ ) - throw (uno::RuntimeException, std::exception) { if( eLayoutEvent == frame::LayoutManagerEvents::MERGEDMENUBAR ) { @@ -1084,7 +1066,6 @@ uno::Reference SAL_CALL const util::URL& rURL, const OUString& rTargetFrameName, sal_Int32 /* nSearchFlags */) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -1099,7 +1080,6 @@ uno::Reference SAL_CALL uno::Sequence > ChartController::queryDispatches( const uno::Sequence& xDescripts ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -1115,7 +1095,6 @@ uno::Sequence > void SAL_CALL ChartController::dispatch( const util::URL& rURL, const uno::Sequence< beans::PropertyValue >& rArgs ) - throw (uno::RuntimeException, std::exception) { OUString aCommand = rURL.Path; @@ -1298,7 +1277,6 @@ void SAL_CALL ChartController::dispatch( void SAL_CALL ChartController::addStatusListener( const uno::Reference& /* xControl */, const util::URL& /* aURL */ ) - throw (uno::RuntimeException, std::exception) { //@todo } @@ -1306,7 +1284,6 @@ void SAL_CALL ChartController::addStatusListener( void SAL_CALL ChartController::removeStatusListener( const uno::Reference& /* xControl */, const util::URL& /* aURL */ ) - throw (uno::RuntimeException, std::exception) { //@todo } @@ -1314,14 +1291,12 @@ void SAL_CALL ChartController::removeStatusListener( // XContextMenuInterception (optional interface) void SAL_CALL ChartController::registerContextMenuInterceptor( const uno::Reference< ui::XContextMenuInterceptor >& /* xInterceptor */) - throw(uno::RuntimeException, std::exception) { //@todo } void SAL_CALL ChartController::releaseContextMenuInterceptor( const uno::Reference< ui::XContextMenuInterceptor > & /* xInterceptor */) - throw(uno::RuntimeException, std::exception) { //@todo } @@ -1392,8 +1367,6 @@ void ChartController::executeDispatch_MoveSeries( bool bForward ) // ____ XMultiServiceFactory ____ uno::Reference< uno::XInterface > SAL_CALL ChartController::createInstance( const OUString& aServiceSpecifier ) - throw (uno::Exception, - uno::RuntimeException, std::exception) { uno::Reference< uno::XInterface > xResult; @@ -1406,7 +1379,6 @@ uno::Reference< uno::XInterface > SAL_CALL ChartController::createInstanceWithArguments( const OUString& ServiceSpecifier, const uno::Sequence< uno::Any >& /* Arguments */ ) - throw (uno::Exception, uno::RuntimeException, std::exception) { // ignore Arguments return createInstance( ServiceSpecifier ); @@ -1414,7 +1386,6 @@ uno::Reference< uno::XInterface > SAL_CALL uno::Sequence< OUString > SAL_CALL ChartController::getAvailableServiceNames() - throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aServiceNames { CHART_ACCESSIBLE_TEXT_SERVICE_NAME }; return aServiceNames; @@ -1423,7 +1394,6 @@ uno::Sequence< OUString > SAL_CALL // ____ XModifyListener ____ void SAL_CALL ChartController::modified( const lang::EventObject& /* aEvent */ ) - throw (uno::RuntimeException, std::exception) { // the source can also be a subobject of the ChartModel // @todo: change the source in ChartModel to always be the model itself ? diff --git a/chart2/source/controller/main/ChartController_Window.cxx b/chart2/source/controller/main/ChartController_Window.cxx index 4e7a7912165d..5f37b989d208 100644 --- a/chart2/source/controller/main/ChartController_Window.cxx +++ b/chart2/source/controller/main/ChartController_Window.cxx @@ -222,7 +222,6 @@ void SAL_CALL ChartController::setPosSize( sal_Int32 Width, sal_Int32 Height, sal_Int16 Flags ) - throw (uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; uno::Reference xWindow = m_xViewWindow; @@ -270,7 +269,6 @@ void SAL_CALL ChartController::setPosSize( } awt::Rectangle SAL_CALL ChartController::getPosSize() - throw (uno::RuntimeException, std::exception) { //@todo awt::Rectangle aRet(0, 0, 0, 0); @@ -283,7 +281,6 @@ awt::Rectangle SAL_CALL ChartController::getPosSize() } void SAL_CALL ChartController::setVisible( sal_Bool Visible ) - throw (uno::RuntimeException, std::exception) { //@todo uno::Reference xWindow = m_xViewWindow; @@ -293,7 +290,6 @@ void SAL_CALL ChartController::setVisible( sal_Bool Visible ) } void SAL_CALL ChartController::setEnable( sal_Bool Enable ) - throw (uno::RuntimeException, std::exception) { //@todo uno::Reference xWindow = m_xViewWindow; @@ -303,7 +299,6 @@ void SAL_CALL ChartController::setEnable( sal_Bool Enable ) } void SAL_CALL ChartController::setFocus() - throw (uno::RuntimeException, std::exception) { //@todo uno::Reference xWindow = m_xViewWindow; @@ -314,7 +309,6 @@ void SAL_CALL ChartController::setFocus() void SAL_CALL ChartController::addWindowListener( const uno::Reference< awt::XWindowListener >& xListener ) - throw (uno::RuntimeException, std::exception) { //@todo uno::Reference xWindow = m_xViewWindow; @@ -325,7 +319,6 @@ void SAL_CALL ChartController::addWindowListener( void SAL_CALL ChartController::removeWindowListener( const uno::Reference< awt::XWindowListener >& xListener ) - throw (uno::RuntimeException, std::exception) { //@todo uno::Reference xWindow = m_xViewWindow; @@ -336,7 +329,6 @@ void SAL_CALL ChartController::removeWindowListener( void SAL_CALL ChartController::addFocusListener( const uno::Reference< awt::XFocusListener >& xListener ) - throw (uno::RuntimeException, std::exception) { //@todo uno::Reference xWindow = m_xViewWindow; @@ -347,7 +339,6 @@ void SAL_CALL ChartController::addFocusListener( void SAL_CALL ChartController::removeFocusListener( const uno::Reference< awt::XFocusListener >& xListener ) - throw (uno::RuntimeException, std::exception) { //@todo uno::Reference xWindow = m_xViewWindow; @@ -358,7 +349,6 @@ void SAL_CALL ChartController::removeFocusListener( void SAL_CALL ChartController::addKeyListener( const uno::Reference< awt::XKeyListener >& xListener ) - throw (uno::RuntimeException, std::exception) { //@todo uno::Reference xWindow = m_xViewWindow; @@ -369,7 +359,6 @@ void SAL_CALL ChartController::addKeyListener( void SAL_CALL ChartController::removeKeyListener( const uno::Reference< awt::XKeyListener >& xListener ) - throw (uno::RuntimeException, std::exception) { //@todo uno::Reference xWindow = m_xViewWindow; @@ -380,7 +369,6 @@ void SAL_CALL ChartController::removeKeyListener( void SAL_CALL ChartController::addMouseListener( const uno::Reference< awt::XMouseListener >& xListener ) - throw (uno::RuntimeException, std::exception) { //@todo uno::Reference xWindow = m_xViewWindow; @@ -391,7 +379,6 @@ void SAL_CALL ChartController::addMouseListener( void SAL_CALL ChartController::removeMouseListener( const uno::Reference< awt::XMouseListener >& xListener ) - throw (uno::RuntimeException, std::exception) { //@todo uno::Reference xWindow = m_xViewWindow; @@ -402,7 +389,6 @@ void SAL_CALL ChartController::removeMouseListener( void SAL_CALL ChartController::addMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener ) - throw (uno::RuntimeException, std::exception) { //@todo uno::Reference xWindow = m_xViewWindow; @@ -413,7 +399,6 @@ void SAL_CALL ChartController::addMouseMotionListener( void SAL_CALL ChartController::removeMouseMotionListener( const uno::Reference< awt::XMouseMotionListener >& xListener ) - throw (uno::RuntimeException, std::exception) { //@todo uno::Reference xWindow = m_xViewWindow; @@ -424,7 +409,6 @@ void SAL_CALL ChartController::removeMouseMotionListener( void SAL_CALL ChartController::addPaintListener( const uno::Reference< awt::XPaintListener >& xListener ) - throw (uno::RuntimeException, std::exception) { //@todo uno::Reference xWindow = m_xViewWindow; @@ -435,7 +419,6 @@ void SAL_CALL ChartController::addPaintListener( void SAL_CALL ChartController::removePaintListener( const uno::Reference< awt::XPaintListener >& xListener ) - throw (uno::RuntimeException, std::exception) { //@todo uno::Reference xWindow = m_xViewWindow; @@ -1560,7 +1543,6 @@ bool ChartController::requestQuickHelp( // XSelectionSupplier (optional interface) sal_Bool SAL_CALL ChartController::select( const uno::Any& rSelection ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { bool bSuccess = false; @@ -1612,7 +1594,6 @@ sal_Bool SAL_CALL ChartController::select( const uno::Any& rSelection ) } uno::Any SAL_CALL ChartController::getSelection() - throw(uno::RuntimeException, std::exception) { uno::Any aReturn; if ( m_aSelection.hasSelection() ) @@ -1632,7 +1613,6 @@ uno::Any SAL_CALL ChartController::getSelection() } void SAL_CALL ChartController::addSelectionChangeListener( const uno::Reference & xListener ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if( impl_isDisposedOrSuspended() )//@todo? allow adding of listeners in suspend mode? @@ -1643,7 +1623,6 @@ void SAL_CALL ChartController::addSelectionChangeListener( const uno::Reference< } void SAL_CALL ChartController::removeSelectionChangeListener( const uno::Reference & xListener ) - throw(uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; if( impl_isDisposedOrSuspended() ) //@todo? allow removing of listeners in suspend mode? diff --git a/chart2/source/controller/main/ChartFrameloader.cxx b/chart2/source/controller/main/ChartFrameloader.cxx index a8d506834150..8d153a1e07fe 100644 --- a/chart2/source/controller/main/ChartFrameloader.cxx +++ b/chart2/source/controller/main/ChartFrameloader.cxx @@ -57,19 +57,16 @@ bool ChartFrameLoader::impl_checkCancel() // lang::XServiceInfo OUString SAL_CALL ChartFrameLoader::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString(CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME); } sal_Bool SAL_CALL ChartFrameLoader::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL ChartFrameLoader::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CHART_FRAMELOADER_SERVICE_NAME }; } @@ -77,7 +74,6 @@ css::uno::Sequence< OUString > SAL_CALL ChartFrameLoader::getSupportedServiceNam // frame::XFrameLoader sal_Bool SAL_CALL ChartFrameLoader::load( const uno::Sequence< beans::PropertyValue >& rMediaDescriptor, const uno::Reference& xFrame ) - throw (uno::RuntimeException, std::exception) { //@todo ? need to add as terminate listener to desktop? @@ -188,7 +184,6 @@ sal_Bool SAL_CALL ChartFrameLoader::load( const uno::Sequence< beans::PropertyVa } void SAL_CALL ChartFrameLoader::cancel() - throw (uno::RuntimeException, std::exception) { m_oCancelFinished.reset(); m_bCancelRequired = true; diff --git a/chart2/source/controller/main/ChartFrameloader.hxx b/chart2/source/controller/main/ChartFrameloader.hxx index 159375b21d36..a6911dd7710d 100644 --- a/chart2/source/controller/main/ChartFrameloader.hxx +++ b/chart2/source/controller/main/ChartFrameloader.hxx @@ -48,22 +48,18 @@ public: virtual ~ChartFrameLoader() override; // css::lang::XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // css::frame::XFrameLoader virtual sal_Bool SAL_CALL load( const css::uno::Sequence< css::beans::PropertyValue >& rMediaDescriptor - ,const css::uno::Reference< css::frame::XFrame >& xFrame ) - throw (css::uno::RuntimeException, std::exception) override; + ,const css::uno::Reference< css::frame::XFrame >& xFrame ) override; virtual void SAL_CALL - cancel() throw (css::uno::RuntimeException, std::exception) override; + cancel() override; }; } //namespace chart diff --git a/chart2/source/controller/main/CommandDispatch.cxx b/chart2/source/controller/main/CommandDispatch.cxx index 851caa41c6ca..42beadb65f8d 100644 --- a/chart2/source/controller/main/CommandDispatch.cxx +++ b/chart2/source/controller/main/CommandDispatch.cxx @@ -75,11 +75,9 @@ void SAL_CALL CommandDispatch::disposing() // ____ XDispatch ____ void SAL_CALL CommandDispatch::dispatch( const util::URL& /* URL */, const Sequence< beans::PropertyValue >& /* Arguments */ ) - throw (uno::RuntimeException, std::exception) {} void SAL_CALL CommandDispatch::addStatusListener( const Reference< frame::XStatusListener >& Control, const util::URL& URL ) - throw (uno::RuntimeException, std::exception) { tListenerMap::iterator aIt( m_aListeners.find( URL.Complete )); if( aIt == m_aListeners.end()) @@ -95,7 +93,6 @@ void SAL_CALL CommandDispatch::addStatusListener( const Reference< frame::XStatu } void SAL_CALL CommandDispatch::removeStatusListener( const Reference< frame::XStatusListener >& Control, const util::URL& URL ) - throw (uno::RuntimeException, std::exception) { tListenerMap::iterator aIt( m_aListeners.find( URL.Complete )); if( aIt != m_aListeners.end()) @@ -104,14 +101,12 @@ void SAL_CALL CommandDispatch::removeStatusListener( const Reference< frame::XSt // ____ XModifyListener ____ void SAL_CALL CommandDispatch::modified( const lang::EventObject& /* aEvent */ ) - throw (uno::RuntimeException, std::exception) { fireAllStatusEvents( nullptr ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL CommandDispatch::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException, std::exception) {} void CommandDispatch::fireAllStatusEvents( diff --git a/chart2/source/controller/main/CommandDispatch.hxx b/chart2/source/controller/main/CommandDispatch.hxx index e4775564ca95..18235c3f8862 100644 --- a/chart2/source/controller/main/CommandDispatch.hxx +++ b/chart2/source/controller/main/CommandDispatch.hxx @@ -98,16 +98,13 @@ protected: // ____ XDispatch ____ virtual void SAL_CALL dispatch( const css::util::URL& URL, - const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override; virtual void SAL_CALL addStatusListener( const css::uno::Reference< css::frame::XStatusListener >& Control, - const css::util::URL& URL ) - throw (css::uno::RuntimeException, std::exception) override; + const css::util::URL& URL ) override; virtual void SAL_CALL removeStatusListener( const css::uno::Reference< css::frame::XStatusListener >& Control, - const css::util::URL& URL ) - throw (css::uno::RuntimeException, std::exception) override; + const css::util::URL& URL ) override; // ____ WeakComponentImplHelperBase ____ /// is called when this is disposed @@ -115,13 +112,11 @@ protected: // ____ XModifyListener ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; protected: css::uno::Reference< css::uno::XComponentContext > m_xContext; diff --git a/chart2/source/controller/main/ControllerCommandDispatch.cxx b/chart2/source/controller/main/ControllerCommandDispatch.cxx index 4175eb8404b7..ebe2b989e7bb 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.cxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.cxx @@ -745,7 +745,6 @@ void ControllerCommandDispatch::fireStatusEvent( void SAL_CALL ControllerCommandDispatch::dispatch( const util::URL& URL, const Sequence< beans::PropertyValue >& Arguments ) - throw (uno::RuntimeException, std::exception) { if( commandAvailable( URL.Complete )) m_xDispatch->dispatch( URL, Arguments ); @@ -762,7 +761,6 @@ void SAL_CALL ControllerCommandDispatch::disposing() // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL ControllerCommandDispatch::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException, std::exception) { m_xChartController.clear(); m_xDispatch.clear(); @@ -771,7 +769,6 @@ void SAL_CALL ControllerCommandDispatch::disposing( const lang::EventObject& /* // ____ XModifyListener ____ void SAL_CALL ControllerCommandDispatch::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { bool bUpdateCommandAvailability = false; @@ -797,7 +794,6 @@ void SAL_CALL ControllerCommandDispatch::modified( const lang::EventObject& aEve // ____ XSelectionChangeListener ____ void SAL_CALL ControllerCommandDispatch::selectionChanged( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { // Update the "ControllerState" Struct. if( m_apControllerState.get() && m_xChartController.is()) diff --git a/chart2/source/controller/main/ControllerCommandDispatch.hxx b/chart2/source/controller/main/ControllerCommandDispatch.hxx index 8afbc619e68f..38d6a8c1e0ed 100644 --- a/chart2/source/controller/main/ControllerCommandDispatch.hxx +++ b/chart2/source/controller/main/ControllerCommandDispatch.hxx @@ -69,8 +69,7 @@ protected: // ____ XDispatch ____ virtual void SAL_CALL dispatch( const css::util::URL& URL, - const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override; // ____ WeakComponentImplHelperBase ____ /// is called when this is disposed @@ -78,8 +77,7 @@ protected: // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; virtual void fireStatusEvent( const OUString & rURL, @@ -87,13 +85,11 @@ protected: // ____ XModifyListener ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XSelectionChangeListener ____ virtual void SAL_CALL selectionChanged( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; private: void fireStatusEventForURLImpl( diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx b/chart2/source/controller/main/DrawCommandDispatch.cxx index fc6e3bb2e123..6fe052ea3db0 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.cxx +++ b/chart2/source/controller/main/DrawCommandDispatch.cxx @@ -228,7 +228,6 @@ void DrawCommandDispatch::disposing() // XEventListener void DrawCommandDispatch::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException, std::exception) { } diff --git a/chart2/source/controller/main/DrawCommandDispatch.hxx b/chart2/source/controller/main/DrawCommandDispatch.hxx index 435e4011edba..7df47171a79e 100644 --- a/chart2/source/controller/main/DrawCommandDispatch.hxx +++ b/chart2/source/controller/main/DrawCommandDispatch.hxx @@ -47,8 +47,7 @@ protected: virtual void SAL_CALL disposing() override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; // state of a feature virtual FeatureState getState( const OUString& rCommand ) override; diff --git a/chart2/source/controller/main/ElementSelector.cxx b/chart2/source/controller/main/ElementSelector.cxx index 920658d9e6a1..d2499c243c31 100644 --- a/chart2/source/controller/main/ElementSelector.cxx +++ b/chart2/source/controller/main/ElementSelector.cxx @@ -244,19 +244,16 @@ Reference< css::accessibility::XAccessible > SelectorListBox::CreateAccessible() } OUString SAL_CALL ElementSelectorToolbarController::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString(lcl_aServiceName); } sal_Bool SAL_CALL ElementSelectorToolbarController::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL ElementSelectorToolbarController::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.frame.ToolbarController" }; } @@ -267,7 +264,7 @@ ElementSelectorToolbarController::~ElementSelectorToolbarController() { } // XInterface -Any SAL_CALL ElementSelectorToolbarController::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception) +Any SAL_CALL ElementSelectorToolbarController::queryInterface( const Type& _rType ) { Any aReturn = ToolboxController::queryInterface(_rType); if (!aReturn.hasValue()) @@ -282,7 +279,7 @@ void SAL_CALL ElementSelectorToolbarController::release() throw () { ToolboxController::release(); } -void SAL_CALL ElementSelectorToolbarController::statusChanged( const frame::FeatureStateEvent& rEvent ) throw ( RuntimeException, std::exception ) +void SAL_CALL ElementSelectorToolbarController::statusChanged( const frame::FeatureStateEvent& rEvent ) { if( m_apSelectorListBox.get() ) { @@ -297,7 +294,6 @@ void SAL_CALL ElementSelectorToolbarController::statusChanged( const frame::Feat } } uno::Reference< awt::XWindow > SAL_CALL ElementSelectorToolbarController::createItemWindow( const uno::Reference< awt::XWindow >& xParent ) - throw (uno::RuntimeException, std::exception) { uno::Reference< awt::XWindow > xItemWindow; if( !m_apSelectorListBox.get() ) diff --git a/chart2/source/controller/main/ElementSelector.hxx b/chart2/source/controller/main/ElementSelector.hxx index b7dd5708d28f..928b360bc84a 100644 --- a/chart2/source/controller/main/ElementSelector.hxx +++ b/chart2/source/controller/main/ElementSelector.hxx @@ -73,22 +73,19 @@ public: virtual ~ElementSelectorToolbarController() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; virtual void SAL_CALL acquire() throw () override; virtual void SAL_CALL release() throw () override; // XStatusListener - virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) throw ( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL statusChanged( const css::frame::FeatureStateEvent& Event ) override; // XToolbarController - virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::awt::XWindow > SAL_CALL createItemWindow( const css::uno::Reference< css::awt::XWindow >& Parent ) override; private: VclPtr< SelectorListBox > m_apSelectorListBox; diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.cxx b/chart2/source/controller/main/FeatureCommandDispatchBase.cxx index 8d02473ed58e..7e4b17fdd45f 100644 --- a/chart2/source/controller/main/FeatureCommandDispatchBase.cxx +++ b/chart2/source/controller/main/FeatureCommandDispatchBase.cxx @@ -75,7 +75,6 @@ void FeatureCommandDispatchBase::fireStatusEvent( const OUString& rURL, // XDispatch void FeatureCommandDispatchBase::dispatch( const util::URL& URL, const Sequence< beans::PropertyValue >& Arguments ) - throw (uno::RuntimeException, std::exception) { OUString aCommand( URL.Complete ); if ( getState( aCommand ).bEnabled ) diff --git a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx index 0d6ed195b710..8dca9c202dca 100644 --- a/chart2/source/controller/main/FeatureCommandDispatchBase.hxx +++ b/chart2/source/controller/main/FeatureCommandDispatchBase.hxx @@ -60,8 +60,7 @@ public: protected: // XDispatch virtual void SAL_CALL dispatch( const css::util::URL& URL, - const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override; virtual void fireStatusEvent( const OUString& rURL, const css::uno::Reference< css::frame::XStatusListener >& xSingleListener ) override; diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx index 58b70e6bfecc..478b0a18aa05 100644 --- a/chart2/source/controller/main/ShapeController.cxx +++ b/chart2/source/controller/main/ShapeController.cxx @@ -71,7 +71,6 @@ void ShapeController::disposing() // XEventListener void ShapeController::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException, std::exception) { } diff --git a/chart2/source/controller/main/ShapeController.hxx b/chart2/source/controller/main/ShapeController.hxx index 34885a725283..70fcdecf9297 100644 --- a/chart2/source/controller/main/ShapeController.hxx +++ b/chart2/source/controller/main/ShapeController.hxx @@ -45,8 +45,7 @@ protected: virtual void SAL_CALL disposing() override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; // state of a feature virtual FeatureState getState( const OUString& rCommand ) override; diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.cxx b/chart2/source/controller/main/StatusBarCommandDispatch.cxx index 3fc479921fba..7b04bb4e4af4 100644 --- a/chart2/source/controller/main/StatusBarCommandDispatch.cxx +++ b/chart2/source/controller/main/StatusBarCommandDispatch.cxx @@ -89,7 +89,6 @@ void StatusBarCommandDispatch::fireStatusEvent( void SAL_CALL StatusBarCommandDispatch::dispatch( const util::URL& /* URL */, const Sequence< beans::PropertyValue >& /* Arguments */ ) - throw (uno::RuntimeException, std::exception) { // nothing to do here } @@ -104,7 +103,6 @@ void SAL_CALL StatusBarCommandDispatch::disposing() // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL StatusBarCommandDispatch::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException, std::exception) { m_xModifiable.clear(); m_xSelectionSupplier.clear(); @@ -112,7 +110,6 @@ void SAL_CALL StatusBarCommandDispatch::disposing( const lang::EventObject& /* S // ____ XModifyListener ____ void SAL_CALL StatusBarCommandDispatch::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { if( m_xModifiable.is()) m_bIsModified = m_xModifiable->isModified(); @@ -122,7 +119,6 @@ void SAL_CALL StatusBarCommandDispatch::modified( const lang::EventObject& aEven // ____ XSelectionChangeListener ____ void SAL_CALL StatusBarCommandDispatch::selectionChanged( const lang::EventObject& /* aEvent */ ) - throw (uno::RuntimeException, std::exception) { if( m_xSelectionSupplier.is()) m_aSelectedOID = ObjectIdentifier( m_xSelectionSupplier->getSelection() ); diff --git a/chart2/source/controller/main/StatusBarCommandDispatch.hxx b/chart2/source/controller/main/StatusBarCommandDispatch.hxx index 87537d902e98..137b8c27142b 100644 --- a/chart2/source/controller/main/StatusBarCommandDispatch.hxx +++ b/chart2/source/controller/main/StatusBarCommandDispatch.hxx @@ -58,8 +58,7 @@ protected: // ____ XDispatch ____ virtual void SAL_CALL dispatch( const css::util::URL& URL, - const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override; // ____ WeakComponentImplHelperBase ____ /// is called when this is disposed @@ -67,13 +66,11 @@ protected: // ____ XModifyListener (override from CommandDispatch) ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; virtual void fireStatusEvent( const OUString & rURL, @@ -81,8 +78,7 @@ protected: // ____ XSelectionChangeListener ____ virtual void SAL_CALL selectionChanged( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; private: css::uno::Reference< css::util::XModifiable > m_xModifiable; diff --git a/chart2/source/controller/main/ToolbarController.cxx b/chart2/source/controller/main/ToolbarController.cxx index 072804b7eea2..54b1e9019903 100644 --- a/chart2/source/controller/main/ToolbarController.cxx +++ b/chart2/source/controller/main/ToolbarController.cxx @@ -44,12 +44,10 @@ ChartToolbarController::~ChartToolbarController() } void ChartToolbarController::execute(sal_Int16 /*nKeyModifier*/) - throw (css::uno::RuntimeException, std::exception) { } void ChartToolbarController::click() - throw (css::uno::RuntimeException, std::exception) { css::uno::Reference xActiveFrame = mxFramesSupplier->getActiveFrame(); if (!xActiveFrame.is()) @@ -69,61 +67,51 @@ void ChartToolbarController::click() } void ChartToolbarController::doubleClick() - throw (css::uno::RuntimeException, std::exception) { SAL_INFO("chart2", "double clicked"); } css::uno::Reference ChartToolbarController::createPopupWindow() - throw (css::uno::RuntimeException, std::exception) { return css::uno::Reference(); } css::uno::Reference ChartToolbarController::createItemWindow( const css::uno::Reference& /*rParent*/) - throw (css::uno::RuntimeException, std::exception) { return css::uno::Reference(); } void ChartToolbarController::statusChanged(const css::frame::FeatureStateEvent& /*rEvent*/) - throw (css::uno::RuntimeException, std::exception) { } void ChartToolbarController::disposing(const css::lang::EventObject& /*rSource*/) - throw (css::uno::RuntimeException, std::exception) { } void ChartToolbarController::initialize(const css::uno::Sequence& /*rAny*/) - throw (css::uno::Exception, std::exception) { } void ChartToolbarController::update() - throw (css::uno::RuntimeException, std::exception) { } OUString ChartToolbarController::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("org.libreoffice.chart2.Chart2ToolboxController"); } sal_Bool ChartToolbarController::supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } css::uno::Sequence ChartToolbarController::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { return { "com.sun.star.frame.ToolbarController" }; } diff --git a/chart2/source/controller/main/UndoActions.cxx b/chart2/source/controller/main/UndoActions.cxx index dd02fb4232b8..1c7f9cc8bc70 100644 --- a/chart2/source/controller/main/UndoActions.cxx +++ b/chart2/source/controller/main/UndoActions.cxx @@ -64,7 +64,7 @@ void SAL_CALL UndoElement::disposing() m_xDocumentModel.clear(); } -OUString SAL_CALL UndoElement::getTitle() throw (RuntimeException, std::exception) +OUString SAL_CALL UndoElement::getTitle() { return m_sActionString; } @@ -79,12 +79,12 @@ void UndoElement::impl_toggleModelState() m_pModelClone = pNewClone; } -void SAL_CALL UndoElement::undo( ) throw (UndoFailedException, RuntimeException, std::exception) +void SAL_CALL UndoElement::undo( ) { impl_toggleModelState(); } -void SAL_CALL UndoElement::redo( ) throw (UndoFailedException, RuntimeException, std::exception) +void SAL_CALL UndoElement::redo( ) { impl_toggleModelState(); } @@ -102,21 +102,21 @@ ShapeUndoElement::~ShapeUndoElement() { } -OUString SAL_CALL ShapeUndoElement::getTitle() throw (RuntimeException, std::exception) +OUString SAL_CALL ShapeUndoElement::getTitle() { if ( !m_pAction ) throw DisposedException( OUString(), *this ); return m_pAction->GetComment(); } -void SAL_CALL ShapeUndoElement::undo( ) throw (UndoFailedException, RuntimeException, std::exception) +void SAL_CALL ShapeUndoElement::undo( ) { if ( !m_pAction ) throw DisposedException( OUString(), *this ); m_pAction->Undo(); } -void SAL_CALL ShapeUndoElement::redo( ) throw (UndoFailedException, RuntimeException, std::exception) +void SAL_CALL ShapeUndoElement::redo( ) { if ( !m_pAction ) throw DisposedException( OUString(), *this ); diff --git a/chart2/source/controller/main/UndoActions.hxx b/chart2/source/controller/main/UndoActions.hxx index ce63b94ea7da..f1ecf3ee131a 100644 --- a/chart2/source/controller/main/UndoActions.hxx +++ b/chart2/source/controller/main/UndoActions.hxx @@ -66,9 +66,9 @@ public: const UndoElement& operator=(const UndoElement&) = delete; // XUndoAction - virtual OUString SAL_CALL getTitle() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL undo( ) throw (css::document::UndoFailedException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL redo( ) throw (css::document::UndoFailedException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTitle() override; + virtual void SAL_CALL undo( ) override; + virtual void SAL_CALL redo( ) override; // OComponentHelper virtual void SAL_CALL disposing() override; @@ -94,9 +94,9 @@ public: explicit ShapeUndoElement( SdrUndoAction& i_sdrUndoAction ); // XUndoAction - virtual OUString SAL_CALL getTitle() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL undo( ) throw (css::document::UndoFailedException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL redo( ) throw (css::document::UndoFailedException, css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getTitle() override; + virtual void SAL_CALL undo( ) override; + virtual void SAL_CALL redo( ) override; // OComponentHelper virtual void SAL_CALL disposing() override; diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx index f170d04778ea..b7466c95c96a 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.cxx +++ b/chart2/source/controller/main/UndoCommandDispatch.cxx @@ -83,7 +83,6 @@ void UndoCommandDispatch::fireStatusEvent( void SAL_CALL UndoCommandDispatch::dispatch( const util::URL& URL, const Sequence< beans::PropertyValue >& /* Arguments */ ) - throw (uno::RuntimeException, std::exception) { if( m_xUndoManager.is() ) { @@ -125,7 +124,6 @@ void SAL_CALL UndoCommandDispatch::disposing() // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL UndoCommandDispatch::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException, std::exception) { m_xUndoManager.clear(); m_xModel.clear(); diff --git a/chart2/source/controller/main/UndoCommandDispatch.hxx b/chart2/source/controller/main/UndoCommandDispatch.hxx index 603e493720fe..db6e299c0efd 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.hxx +++ b/chart2/source/controller/main/UndoCommandDispatch.hxx @@ -44,8 +44,7 @@ protected: // ____ XDispatch ____ virtual void SAL_CALL dispatch( const css::util::URL& URL, - const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& Arguments ) override; // ____ WeakComponentImplHelperBase ____ /// is called when this is disposed @@ -53,8 +52,7 @@ protected: // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; virtual void fireStatusEvent( const OUString & rURL, diff --git a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx index 1da8c639343e..18f327557fec 100644 --- a/chart2/source/controller/sidebar/Chart2PanelFactory.cxx +++ b/chart2/source/controller/sidebar/Chart2PanelFactory.cxx @@ -54,10 +54,6 @@ ChartPanelFactory::~ChartPanelFactory() Reference SAL_CALL ChartPanelFactory::createUIElement ( const ::rtl::OUString& rsResourceURL, const ::css::uno::Sequence& rArguments) - throw( - css::container::NoSuchElementException, - css::lang::IllegalArgumentException, - RuntimeException, std::exception) { Reference xElement; @@ -125,19 +121,16 @@ Reference SAL_CALL ChartPanelFactory::createUIElement ( } OUString ChartPanelFactory::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString("org.libreoffice.comp.chart2.sidebar.ChartPanelFactory"); } sal_Bool ChartPanelFactory::supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } css::uno::Sequence ChartPanelFactory::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { return { "com.sun.star.ui.UIElementFactory" }; } diff --git a/chart2/source/controller/sidebar/Chart2PanelFactory.hxx b/chart2/source/controller/sidebar/Chart2PanelFactory.hxx index 6fe6b4afc209..14570c143a88 100644 --- a/chart2/source/controller/sidebar/Chart2PanelFactory.hxx +++ b/chart2/source/controller/sidebar/Chart2PanelFactory.hxx @@ -46,20 +46,13 @@ public: // XUIElementFactory virtual css::uno::Reference SAL_CALL createUIElement( const ::rtl::OUString& rsResourceURL, - const ::css::uno::Sequence& rArguments) - throw( - css::container::NoSuchElementException, - css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception ) override; + const ::css::uno::Sequence& rArguments) override; - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override; - virtual css::uno::Sequence SAL_CALL getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence SAL_CALL getSupportedServiceNames() override; }; } } // end of namespace sc::sidebar diff --git a/chart2/source/controller/sidebar/ChartSidebarModifyListener.cxx b/chart2/source/controller/sidebar/ChartSidebarModifyListener.cxx index fdf2dc14a460..b000e55c5aa6 100644 --- a/chart2/source/controller/sidebar/ChartSidebarModifyListener.cxx +++ b/chart2/source/controller/sidebar/ChartSidebarModifyListener.cxx @@ -26,13 +26,11 @@ ChartSidebarModifyListener::~ChartSidebarModifyListener() } void ChartSidebarModifyListener::modified(const css::lang::EventObject& /*rEvent*/) - throw (::css::uno::RuntimeException, ::std::exception) { mpParent->updateData(); } void ChartSidebarModifyListener::disposing(const css::lang::EventObject& /*rEvent*/) - throw (::css::uno::RuntimeException, ::std::exception) { mpParent->modelInvalid(); } diff --git a/chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx b/chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx index 69b71d6157de..9efe382e2761 100644 --- a/chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx +++ b/chart2/source/controller/sidebar/ChartSidebarModifyListener.hxx @@ -33,11 +33,9 @@ public: explicit ChartSidebarModifyListener(ChartSidebarModifyListenerParent* pParent); virtual ~ChartSidebarModifyListener() override; - virtual void SAL_CALL modified(const css::lang::EventObject& rEvent) - throw (::css::uno::RuntimeException, ::std::exception) override; + virtual void SAL_CALL modified(const css::lang::EventObject& rEvent) override; - virtual void SAL_CALL disposing(const css::lang::EventObject& rEvent) - throw (::css::uno::RuntimeException, ::std::exception) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& rEvent) override; private: ChartSidebarModifyListenerParent* mpParent; diff --git a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx index 30a2e63bfccc..c94490f1dc1b 100644 --- a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx +++ b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.cxx @@ -40,7 +40,6 @@ ChartSidebarSelectionListener::~ChartSidebarSelectionListener() } void ChartSidebarSelectionListener::selectionChanged(const css::lang::EventObject& rEvent) - throw (::css::uno::RuntimeException, ::std::exception) { bool bCorrectObjectSelected = false; @@ -66,7 +65,6 @@ void ChartSidebarSelectionListener::selectionChanged(const css::lang::EventObjec } void ChartSidebarSelectionListener::disposing(const css::lang::EventObject& /*rEvent*/) - throw (::css::uno::RuntimeException, ::std::exception) { mpParent->SelectionInvalid(); } diff --git a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx index 85df72231369..bf3bdbd2558a 100644 --- a/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx +++ b/chart2/source/controller/sidebar/ChartSidebarSelectionListener.hxx @@ -40,11 +40,9 @@ public: ChartSidebarSelectionListener(ChartSidebarSelectionListenerParent* pParent, ObjectType eType); virtual ~ChartSidebarSelectionListener() override; - virtual void SAL_CALL selectionChanged(const css::lang::EventObject& rEvent) - throw (::css::uno::RuntimeException, ::std::exception) override; + virtual void SAL_CALL selectionChanged(const css::lang::EventObject& rEvent) override; - virtual void SAL_CALL disposing(const css::lang::EventObject& rEvent) - throw (::css::uno::RuntimeException, ::std::exception) override; + virtual void SAL_CALL disposing(const css::lang::EventObject& rEvent) override; void setAcceptedTypes(const std::vector& aTypes); diff --git a/chart2/source/inc/CachedDataSequence.hxx b/chart2/source/inc/CachedDataSequence.hxx index 2cbe9c6bd048..2e4c6359550e 100644 --- a/chart2/source/inc/CachedDataSequence.hxx +++ b/chart2/source/inc/CachedDataSequence.hxx @@ -82,12 +82,9 @@ public: virtual ~CachedDataSequence() override; /// declare XServiceInfo methods - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; /// merge XInterface implementations DECLARE_XINTERFACE() @@ -97,48 +94,38 @@ public: protected: // ____ XPropertySet ____ /// @see css::beans::XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override; /// @see ::comphelper::OPropertySetHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; /// @see ::comphelper::OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override; // ____ XDataSequence ____ - virtual css::uno::Sequence< css::uno::Any > SAL_CALL getData() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSourceRangeRepresentation() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getData() override; + virtual OUString SAL_CALL getSourceRangeRepresentation() override; virtual css::uno::Sequence< OUString > SAL_CALL generateLabel( - css::chart2::data::LabelOrigin nLabelOrigin ) - throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + css::chart2::data::LabelOrigin nLabelOrigin ) override; + virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) override; // ____ XNumericalDataSequence ____ /// @see css::chart::data::XNumericalDataSequence - virtual css::uno::Sequence< double > SAL_CALL getNumericalData() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< double > SAL_CALL getNumericalData() override; // ____ XTextualDataSequence ____ /// @see css::chart::data::XTextualDataSequence - virtual css::uno::Sequence< OUString > SAL_CALL getTextualData() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getTextualData() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // css::lang::XInitialization: - virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) - throw (css::uno::RuntimeException, css::uno::Exception, std::exception) override; + virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) override; // sal_Int32 m_nNumberFormatKey; diff --git a/chart2/source/inc/ConfigColorScheme.hxx b/chart2/source/inc/ConfigColorScheme.hxx index a8feeb12b8a9..7fd695242bd4 100644 --- a/chart2/source/inc/ConfigColorScheme.hxx +++ b/chart2/source/inc/ConfigColorScheme.hxx @@ -49,20 +49,16 @@ public: virtual ~ConfigColorScheme() override; /// declare XServiceInfo methods - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // ____ ConfigItemListener ____ void notify( const OUString & rPropertyName ); protected: // ____ XColorScheme ____ - virtual ::sal_Int32 SAL_CALL getColorByIndex( ::sal_Int32 nIndex ) - throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getColorByIndex( ::sal_Int32 nIndex ) override; private: void retrieveConfigColors(); diff --git a/chart2/source/inc/DataSource.hxx b/chart2/source/inc/DataSource.hxx index f0d6eb851157..87fcd5693606 100644 --- a/chart2/source/inc/DataSource.hxx +++ b/chart2/source/inc/DataSource.hxx @@ -43,22 +43,17 @@ public: virtual ~DataSource() override; /// declare XServiceInfo methods - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; protected: // ____ XDataSource ____ virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL - getDataSequences() - throw (css::uno::RuntimeException, std::exception) override; + getDataSequences() override; // ____ XDataSink ____ - virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > >& aData ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > >& aData ) override; private: css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > diff --git a/chart2/source/inc/ErrorBar.hxx b/chart2/source/inc/ErrorBar.hxx index 565e93d94af2..1436d436dd5f 100644 --- a/chart2/source/inc/ErrorBar.hxx +++ b/chart2/source/inc/ErrorBar.hxx @@ -83,72 +83,52 @@ public: virtual ~ErrorBar() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; // XPropertyState - virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& rPropName ) - throw (css::beans::UnknownPropertyException, std::exception) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& rPropName ) override; virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( - const css::uno::Sequence< OUString >& rPropNames ) - throw (css::beans::UnknownPropertyException, std::exception) override; - virtual void SAL_CALL setPropertyToDefault( const OUString& rPropName ) - throw (css::beans::UnknownPropertyException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropName ) - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, std::exception) override; + const css::uno::Sequence< OUString >& rPropNames ) override; + virtual void SAL_CALL setPropertyToDefault( const OUString& rPropName ) override; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& rPropName ) override; protected: ErrorBar( const ErrorBar & rOther ); // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // ____ XModifyListener ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; // ____ XDataSink ____ - virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > >& aData ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > >& aData ) override; // ____ XDataSource ____ - virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() override; private: typedef ::std::vector< css::uno::Reference< diff --git a/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx b/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx index f6400b090329..ba08bb13dfd1 100644 --- a/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx +++ b/chart2/source/inc/ExponentialRegressionCurveCalculator.hxx @@ -39,12 +39,9 @@ private: // ____ XRegressionCurveCalculator ____ virtual void SAL_CALL recalculateRegression( const css::uno::Sequence& aXValues, - const css::uno::Sequence& aYValues ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence& aYValues ) override; - virtual double SAL_CALL getCurveValue( double x ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL getCurveValue( double x ) override; virtual css::uno::Sequence SAL_CALL getCurveValues( double min, @@ -52,9 +49,7 @@ private: sal_Int32 nPointCount, const css::uno::Reference& xScalingX, const css::uno::Reference& xScalingY, - sal_Bool bMaySkipPointsInCalculation ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + sal_Bool bMaySkipPointsInCalculation ) override; // formula is: f(x) = m_fSign * exp(m_fLogIntercept) * exp( m_fLogSlope * x ) // mathematical model f(x) = Intercept * Slope^x diff --git a/chart2/source/inc/InternalDataProvider.hxx b/chart2/source/inc/InternalDataProvider.hxx index 5142ef7ac6ce..183228250df4 100644 --- a/chart2/source/inc/InternalDataProvider.hxx +++ b/chart2/source/inc/InternalDataProvider.hxx @@ -80,143 +80,99 @@ public: virtual ~InternalDataProvider() override; /// declare XServiceInfo methods - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // ____ XInternalDataProvider ____ - virtual sal_Bool SAL_CALL hasDataByRangeRepresentation( const OUString& aRange ) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasDataByRangeRepresentation( const OUString& aRange ) override; virtual css::uno::Sequence< css::uno::Any > SAL_CALL - getDataByRangeRepresentation( const OUString& aRange ) - throw (css::uno::RuntimeException, std::exception) override; + getDataByRangeRepresentation( const OUString& aRange ) override; virtual void SAL_CALL setDataByRangeRepresentation( const OUString& aRange, - const css::uno::Sequence< css::uno::Any >& aNewData ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insertSequence( ::sal_Int32 nAfterIndex ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL deleteSequence( ::sal_Int32 nAtIndex ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL appendSequence() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insertComplexCategoryLevel( ::sal_Int32 nLevel ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL deleteComplexCategoryLevel( ::sal_Int32 nLevel ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insertDataPointForAllSequences( ::sal_Int32 nAfterIndex ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL deleteDataPointForAllSequences( ::sal_Int32 nAtIndex ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL swapDataPointWithNextOneForAllSequences( ::sal_Int32 nAtIndex ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Any >& aNewData ) override; + virtual void SAL_CALL insertSequence( ::sal_Int32 nAfterIndex ) override; + virtual void SAL_CALL deleteSequence( ::sal_Int32 nAtIndex ) override; + virtual void SAL_CALL appendSequence() override; + virtual void SAL_CALL insertComplexCategoryLevel( ::sal_Int32 nLevel ) override; + virtual void SAL_CALL deleteComplexCategoryLevel( ::sal_Int32 nLevel ) override; + virtual void SAL_CALL insertDataPointForAllSequences( ::sal_Int32 nAfterIndex ) override; + virtual void SAL_CALL deleteDataPointForAllSequences( ::sal_Int32 nAtIndex ) override; + virtual void SAL_CALL swapDataPointWithNextOneForAllSequences( ::sal_Int32 nAtIndex ) override; virtual void SAL_CALL registerDataSequenceForChanges( - const css::uno::Reference< css::chart2::data::XDataSequence >& xSeq ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::data::XDataSequence >& xSeq ) override; // ____ XDataProvider (base of XInternalDataProvider) ____ virtual sal_Bool SAL_CALL createDataSourcePossible( - const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) override; virtual css::uno::Reference< css::chart2::data::XDataSource > SAL_CALL createDataSource( - const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) override; virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL detectArguments( - const css::uno::Reference< css::chart2::data::XDataSource >& xDataSource ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::data::XDataSource >& xDataSource ) override; virtual sal_Bool SAL_CALL createDataSequenceByRangeRepresentationPossible( - const OUString& aRangeRepresentation ) - throw (css::uno::RuntimeException, std::exception) override; + const OUString& aRangeRepresentation ) override; virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL createDataSequenceByRangeRepresentation( - const OUString& aRangeRepresentation ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const OUString& aRangeRepresentation ) override; virtual css::uno::Reference SAL_CALL - createDataSequenceByValueArray( const OUString& aRole, const OUString& aRangeRepresentation ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; + createDataSequenceByValueArray( const OUString& aRole, const OUString& aRangeRepresentation ) override; - virtual css::uno::Reference< css::sheet::XRangeSelection > SAL_CALL getRangeSelection() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sheet::XRangeSelection > SAL_CALL getRangeSelection() override; // ____ XRangeXMLConversion ____ virtual OUString SAL_CALL convertRangeToXML( - const OUString& aRangeRepresentation ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const OUString& aRangeRepresentation ) override; virtual OUString SAL_CALL convertRangeFromXML( - const OUString& aXMLRange ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const OUString& aXMLRange ) override; // ____ XDateCategories ____ - virtual css::uno::Sequence< double > SAL_CALL getDateCategories() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDateCategories( const css::uno::Sequence< double >& rDates ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< double > SAL_CALL getDateCategories() override; + virtual void SAL_CALL setDateCategories( const css::uno::Sequence< double >& rDates ) override; // ____ XAnyDescriptionAccess ____ virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > > SAL_CALL - getAnyRowDescriptions() throw (css::uno::RuntimeException, std::exception) override; + getAnyRowDescriptions() override; virtual void SAL_CALL setAnyRowDescriptions( - const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aRowDescriptions ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aRowDescriptions ) override; virtual css::uno::Sequence< css::uno::Sequence< css::uno::Any > > SAL_CALL - getAnyColumnDescriptions() throw (css::uno::RuntimeException, std::exception) override; + getAnyColumnDescriptions() override; virtual void SAL_CALL setAnyColumnDescriptions( - const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aColumnDescriptions ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Sequence< css::uno::Any > >& aColumnDescriptions ) override; // ____ XComplexDescriptionAccess (base of XAnyDescriptionAccess) ____ virtual css::uno::Sequence< css::uno::Sequence< OUString > > SAL_CALL - getComplexRowDescriptions() throw (css::uno::RuntimeException, std::exception) override; + getComplexRowDescriptions() override; virtual void SAL_CALL setComplexRowDescriptions( - const css::uno::Sequence< css::uno::Sequence< OUString > >& aRowDescriptions ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Sequence< OUString > >& aRowDescriptions ) override; virtual css::uno::Sequence< css::uno::Sequence< OUString > > SAL_CALL - getComplexColumnDescriptions() throw (css::uno::RuntimeException, std::exception) override; + getComplexColumnDescriptions() override; virtual void SAL_CALL setComplexColumnDescriptions( - const css::uno::Sequence< css::uno::Sequence< OUString > >& aColumnDescriptions ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Sequence< OUString > >& aColumnDescriptions ) override; // ____ XChartDataArray (base of XComplexDescriptionAccess) ____ - virtual css::uno::Sequence< css::uno::Sequence< double > > SAL_CALL getData() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Sequence< double > > SAL_CALL getData() override; virtual void SAL_CALL setData( - const css::uno::Sequence< css::uno::Sequence< double > >& aData ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getRowDescriptions() - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Sequence< double > >& aData ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getRowDescriptions() override; virtual void SAL_CALL setRowDescriptions( - const css::uno::Sequence< OUString >& aRowDescriptions ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getColumnDescriptions() - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< OUString >& aRowDescriptions ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getColumnDescriptions() override; virtual void SAL_CALL setColumnDescriptions( - const css::uno::Sequence< OUString >& aColumnDescriptions ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< OUString >& aColumnDescriptions ) override; // ____ XChartData (base of XChartDataArray) ____ virtual void SAL_CALL addChartDataChangeEventListener( - const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) override; virtual void SAL_CALL removeChartDataChangeEventListener( - const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getNotANumber() - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart::XChartDataChangeEventListener >& aListener ) override; + virtual double SAL_CALL getNotANumber() override; virtual sal_Bool SAL_CALL isNotANumber( - double nNumber ) - throw (css::uno::RuntimeException, std::exception) override; + double nNumber ) override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; // css::lang::XInitialization: - virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) - throw (css::uno::RuntimeException, css::uno::Exception, std::exception) override; + virtual void SAL_CALL initialize(const css::uno::Sequence< css::uno::Any > & aArguments) override; private: void addDataSequenceToMap( diff --git a/chart2/source/inc/LabeledDataSequence.hxx b/chart2/source/inc/LabeledDataSequence.hxx index b36ba3298c3c..948b38898a0d 100644 --- a/chart2/source/inc/LabeledDataSequence.hxx +++ b/chart2/source/inc/LabeledDataSequence.hxx @@ -55,37 +55,27 @@ public: virtual ~LabeledDataSequence() override; /// declare XServiceInfo methods - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; protected: // ____ XLabeledDataSequence ____ - virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL getValues() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL getValues() override; virtual void SAL_CALL setValues( - const css::uno::Reference< css::chart2::data::XDataSequence >& xSequence ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL getLabel() - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::data::XDataSequence >& xSequence ) override; + virtual css::uno::Reference< css::chart2::data::XDataSequence > SAL_CALL getLabel() override; virtual void SAL_CALL setLabel( - const css::uno::Reference< css::chart2::data::XDataSequence >& xSequence ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::data::XDataSequence >& xSequence ) override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; private: css::uno::Reference< css::chart2::data::XDataSequence > m_xData; diff --git a/chart2/source/inc/LifeTime.hxx b/chart2/source/inc/LifeTime.hxx index ba652671103f..c3a648d26819 100644 --- a/chart2/source/inc/LifeTime.hxx +++ b/chart2/source/inc/LifeTime.hxx @@ -44,7 +44,7 @@ public: bool impl_isDisposed( bool bAssert=true ); /// @throws css::uno::RuntimeException - bool dispose() throw(css::uno::RuntimeException); + bool dispose(); public: ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; @@ -91,16 +91,13 @@ OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager() override; OOO_DLLPUBLIC_CHARTTOOLS bool impl_isDisposedOrClosed( bool bAssert=true ); /// @throws css::uno::Exception -OOO_DLLPUBLIC_CHARTTOOLS bool g_close_startTryClose(bool bDeliverOwnership) - throw ( css::uno::Exception ); +OOO_DLLPUBLIC_CHARTTOOLS bool g_close_startTryClose(bool bDeliverOwnership); /// @throws css::util::CloseVetoException -OOO_DLLPUBLIC_CHARTTOOLS bool g_close_isNeedToCancelLongLastingCalls( bool bDeliverOwnership, css::util::CloseVetoException& ex ) - throw ( css::util::CloseVetoException ); +OOO_DLLPUBLIC_CHARTTOOLS bool g_close_isNeedToCancelLongLastingCalls( bool bDeliverOwnership, css::util::CloseVetoException& ex ); OOO_DLLPUBLIC_CHARTTOOLS void g_close_endTryClose(bool bDeliverOwnership, bool bMyVeto ); OOO_DLLPUBLIC_CHARTTOOLS void g_close_endTryClose_doClose(); /// @throws css::uno::RuntimeException -OOO_DLLPUBLIC_CHARTTOOLS void g_addCloseListener( const css::uno::Reference< css::util::XCloseListener > & xListener ) - throw(css::uno::RuntimeException); +OOO_DLLPUBLIC_CHARTTOOLS void g_addCloseListener( const css::uno::Reference< css::util::XCloseListener > & xListener ); protected: virtual bool impl_canStartApiCall() override; diff --git a/chart2/source/inc/LinearRegressionCurveCalculator.hxx b/chart2/source/inc/LinearRegressionCurveCalculator.hxx index df36c2d72d8d..11d323887b98 100644 --- a/chart2/source/inc/LinearRegressionCurveCalculator.hxx +++ b/chart2/source/inc/LinearRegressionCurveCalculator.hxx @@ -36,8 +36,7 @@ private: sal_Int32 aDegree, sal_Bool aForceIntercept, double aInterceptValue, - sal_Int32 aPeriod) - throw (css::uno::RuntimeException, std::exception) override; + sal_Int32 aPeriod) override; virtual css::uno::Sequence SAL_CALL getCurveValues( double min, @@ -45,9 +44,7 @@ private: sal_Int32 nPointCount, const css::uno::Reference& xScalingX, const css::uno::Reference& xScalingY, - sal_Bool bMaySkipPointsInCalculation ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + sal_Bool bMaySkipPointsInCalculation ) override; }; } // namespace chart diff --git a/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx b/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx index ec16964566aa..522756afe139 100644 --- a/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx +++ b/chart2/source/inc/LogarithmicRegressionCurveCalculator.hxx @@ -39,12 +39,9 @@ private: // ____ XRegressionCurveCalculator ____ virtual void SAL_CALL recalculateRegression( const css::uno::Sequence& aXValues, - const css::uno::Sequence& aYValues ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence& aYValues ) override; - virtual double SAL_CALL getCurveValue( double x ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL getCurveValue( double x ) override; virtual css::uno::Sequence SAL_CALL getCurveValues( double min, @@ -52,9 +49,7 @@ private: sal_Int32 nPointCount, const css::uno::Reference& xScalingX, const css::uno::Reference& xScalingY, - sal_Bool bMaySkipPointsInCalculation ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + sal_Bool bMaySkipPointsInCalculation ) override; // formula is: f(x) = m_fSlope * log( x ) + m_fIntercept double m_fSlope; diff --git a/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx b/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx index 4ccc817b4033..7c947bec4d8c 100644 --- a/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx +++ b/chart2/source/inc/MeanValueRegressionCurveCalculator.hxx @@ -39,12 +39,9 @@ private: // ____ XRegressionCurveCalculator ____ virtual void SAL_CALL recalculateRegression( const css::uno::Sequence& aXValues, - const css::uno::Sequence& aYValues ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence& aYValues ) override; - virtual double SAL_CALL getCurveValue( double x ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL getCurveValue( double x ) override; virtual css::uno::Sequence SAL_CALL getCurveValues( double min, @@ -52,9 +49,7 @@ private: sal_Int32 nPointCount, const css::uno::Reference& xScalingX, const css::uno::Reference& xScalingY, - sal_Bool bMaySkipPointsInCalculation ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + sal_Bool bMaySkipPointsInCalculation ) override; // formula is: f(x) = m_fMeanValue double m_fMeanValue; diff --git a/chart2/source/inc/ModifyListenerHelper.hxx b/chart2/source/inc/ModifyListenerHelper.hxx index 5f167233da00..d26bb258839c 100644 --- a/chart2/source/inc/ModifyListenerHelper.hxx +++ b/chart2/source/inc/ModifyListenerHelper.hxx @@ -67,21 +67,17 @@ public: protected: // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // ____ XModifyListener ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; // ____ WeakComponentImplHelperBase ____ virtual void SAL_CALL disposing() override; diff --git a/chart2/source/inc/MovingAverageRegressionCurveCalculator.hxx b/chart2/source/inc/MovingAverageRegressionCurveCalculator.hxx index a43635a9cc06..fb6185098193 100644 --- a/chart2/source/inc/MovingAverageRegressionCurveCalculator.hxx +++ b/chart2/source/inc/MovingAverageRegressionCurveCalculator.hxx @@ -40,12 +40,9 @@ private: // ____ XRegressionCurveCalculator ____ virtual void SAL_CALL recalculateRegression( const css::uno::Sequence& aXValues, - const css::uno::Sequence& aYValues ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence& aYValues ) override; - virtual double SAL_CALL getCurveValue( double x ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL getCurveValue( double x ) override; virtual css::uno::Sequence SAL_CALL getCurveValues( double min, @@ -53,9 +50,7 @@ private: sal_Int32 nPointCount, const css::uno::Reference& xScalingX, const css::uno::Reference& xScalingY, - sal_Bool bMaySkipPointsInCalculation ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + sal_Bool bMaySkipPointsInCalculation ) override; std::vector aYList; std::vector aXList; diff --git a/chart2/source/inc/NameContainer.hxx b/chart2/source/inc/NameContainer.hxx index 91c3a9970a33..268255bfc7c0 100644 --- a/chart2/source/inc/NameContainer.hxx +++ b/chart2/source/inc/NameContainer.hxx @@ -53,28 +53,28 @@ public: virtual ~NameContainer() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) throw( css::lang::IllegalArgumentException, css::container::ElementExistException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByName( const OUString& Name ) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) override; + virtual void SAL_CALL removeByName( const OUString& Name ) override; // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) throw( css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override; // XNameAccess - virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) throw( css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) throw( css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; // XElementAccess - virtual sal_Bool SAL_CALL hasElements( ) throw( css::uno::RuntimeException, std::exception) override; - virtual css::uno::Type SAL_CALL getElementType( ) throw( css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements( ) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; // XCloneable - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; private: //member const css::uno::Type m_aType; diff --git a/chart2/source/inc/OPropertySet.hxx b/chart2/source/inc/OPropertySet.hxx index 0d0f5fa02157..fd5ad5632366 100644 --- a/chart2/source/inc/OPropertySet.hxx +++ b/chart2/source/inc/OPropertySet.hxx @@ -68,9 +68,7 @@ protected: @throws css::beans::UnknownPropertyException @throws css::uno::RuntimeException */ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException) = 0; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const = 0; /** The InfoHelper table contains all property names and types of this object. @@ -110,8 +108,7 @@ protected: ( css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, - const css::uno::Any& rValue ) - throw (css::lang::IllegalArgumentException) override; + const css::uno::Any& rValue ) override; /** The same as setFastProperyValue; nHandle is always valid. The changes must not be broadcasted in this method. @@ -132,8 +129,7 @@ protected: */ virtual void SAL_CALL setFastPropertyValue_NoBroadcast ( sal_Int32 nHandle, - const css::uno::Any& rValue ) - throw (css::uno::Exception, std::exception) override; + const css::uno::Any& rValue ) override; /** The same as getFastProperyValue, but return the value through rValue and @@ -156,68 +152,45 @@ protected: // Interfaces // ____ XInterface ____ - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; // ____ XTypeProvider ____ virtual css::uno::Sequence< css::uno::Type > SAL_CALL - getTypes() - throw (css::uno::RuntimeException, std::exception) override; + getTypes() override; virtual css::uno::Sequence< sal_Int8 > SAL_CALL - getImplementationId() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationId() override; // ____ XPropertyState ____ virtual css::beans::PropertyState SAL_CALL - getPropertyState( const OUString& PropertyName ) - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException, std::exception) override; + getPropertyState( const OUString& PropertyName ) override; virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL - getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException, std::exception) override; + getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) override; virtual void SAL_CALL - setPropertyToDefault( const OUString& PropertyName ) - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException, std::exception) override; + setPropertyToDefault( const OUString& PropertyName ) override; virtual css::uno::Any SAL_CALL - getPropertyDefault( const OUString& aPropertyName ) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + getPropertyDefault( const OUString& aPropertyName ) override; // ____ XMultiPropertyStates ____ // Note: getPropertyStates() is already implemented in XPropertyState with the // same signature virtual void SAL_CALL - setAllPropertiesToDefault() - throw (css::uno::RuntimeException, std::exception) override; + setAllPropertiesToDefault() override; virtual void SAL_CALL - setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException, std::exception) override; + setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) override; virtual css::uno::Sequence< css::uno::Any > SAL_CALL - getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) override; // ____ XStyleSupplier ____ - virtual css::uno::Reference< css::style::XStyle > SAL_CALL getStyle() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setStyle( const css::uno::Reference< css::style::XStyle >& xStyle ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::style::XStyle > SAL_CALL getStyle() override; + virtual void SAL_CALL setStyle( const css::uno::Reference< css::style::XStyle >& xStyle ) override; // ____ XMultiPropertySet ____ virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& PropertyNames, - const css::uno::Sequence< css::uno::Any >& Values ) - throw(css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Any >& Values ) override; // ____ XFastPropertySet ____ - virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue ) - throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue ) override; // Note: it is assumed that the base class implements setPropertyValue by // using setFastPropertyValue diff --git a/chart2/source/inc/PolynomialRegressionCurveCalculator.hxx b/chart2/source/inc/PolynomialRegressionCurveCalculator.hxx index a6e08c6115f7..6037fc742a78 100644 --- a/chart2/source/inc/PolynomialRegressionCurveCalculator.hxx +++ b/chart2/source/inc/PolynomialRegressionCurveCalculator.hxx @@ -36,16 +36,13 @@ protected: const css::uno::Reference& xNumFormatter, sal_Int32 nNumberFormatKey, sal_Int32* pFormulaMaxWidth = nullptr ) const override; - virtual double SAL_CALL getCurveValue( double x ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL getCurveValue( double x ) override; private: // ____ XRegressionCurveCalculator ____ virtual void SAL_CALL recalculateRegression( const css::uno::Sequence& aXValues, - const css::uno::Sequence& aYValues ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence& aYValues ) override; std::vector mCoefficients; }; diff --git a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx index 7a890617ca2a..06cdc5080316 100644 --- a/chart2/source/inc/PotentialRegressionCurveCalculator.hxx +++ b/chart2/source/inc/PotentialRegressionCurveCalculator.hxx @@ -40,12 +40,9 @@ private: // ____ XRegressionCurveCalculator ____ virtual void SAL_CALL recalculateRegression( const css::uno::Sequence& aXValues, - const css::uno::Sequence& aYValues ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence& aYValues ) override; - virtual double SAL_CALL getCurveValue( double x ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL getCurveValue( double x ) override; virtual css::uno::Sequence SAL_CALL getCurveValues( double min, @@ -53,9 +50,7 @@ private: sal_Int32 nPointCount, const css::uno::Reference& xScalingX, const css::uno::Reference& xScalingY, - sal_Bool bMaySkipPointsInCalculation ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + sal_Bool bMaySkipPointsInCalculation ) override; // formula is: f(x) = x ^ m_fSlope * m_fSign * m_fIntercept double m_fSlope; diff --git a/chart2/source/inc/RangeHighlighter.hxx b/chart2/source/inc/RangeHighlighter.hxx index a7b67169fab8..01f408116bc8 100644 --- a/chart2/source/inc/RangeHighlighter.hxx +++ b/chart2/source/inc/RangeHighlighter.hxx @@ -55,24 +55,19 @@ public: protected: // ____ XRangeHighlighter ____ - virtual css::uno::Sequence< css::chart2::data::HighlightedRange > SAL_CALL getSelectedRanges() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::chart2::data::HighlightedRange > SAL_CALL getSelectedRanges() override; virtual void SAL_CALL addSelectionChangeListener( - const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) override; virtual void SAL_CALL removeSelectionChangeListener( - const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::view::XSelectionChangeListener >& xListener ) override; // ____ XSelectionChangeListener ____ virtual void SAL_CALL selectionChanged( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XSelectionChangeListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; // ____ WeakComponentImplHelperBase ____ // is called when dispose() is called at this component diff --git a/chart2/source/inc/RegressionCurveCalculator.hxx b/chart2/source/inc/RegressionCurveCalculator.hxx index ff063c8a8c96..aeab66d280fa 100644 --- a/chart2/source/inc/RegressionCurveCalculator.hxx +++ b/chart2/source/inc/RegressionCurveCalculator.hxx @@ -67,17 +67,13 @@ protected: sal_Int32 aDegree, sal_Bool aForceIntercept, double aInterceptValue, - sal_Int32 aPeriod) - throw (css::uno::RuntimeException, std::exception) override; + sal_Int32 aPeriod) override; virtual void SAL_CALL recalculateRegression( const css::uno::Sequence< double >& aXValues, - const css::uno::Sequence< double >& aYValues ) - throw (css::uno::RuntimeException, std::exception) override = 0; + const css::uno::Sequence< double >& aYValues ) override = 0; - virtual double SAL_CALL getCurveValue( double x ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override = 0; + virtual double SAL_CALL getCurveValue( double x ) override = 0; virtual css::uno::Sequence< css::geometry::RealPoint2D > SAL_CALL getCurveValues( double min, @@ -85,24 +81,18 @@ protected: sal_Int32 nPointCount, const css::uno::Reference< css::chart2::XScaling >& xScalingX, const css::uno::Reference< css::chart2::XScaling >& xScalingY, - sal_Bool bMaySkipPointsInCalculation ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + sal_Bool bMaySkipPointsInCalculation ) override; - virtual double SAL_CALL getCorrelationCoefficient() - throw (css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL getCorrelationCoefficient() override; - virtual OUString SAL_CALL getRepresentation() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getRepresentation() override; virtual OUString SAL_CALL getFormattedRepresentation( const css::uno::Reference< css::util::XNumberFormatsSupplier >& xNumFmtSupplier, - sal_Int32 nNumberFormatKey, sal_Int32 nFormulaLength ) - throw (css::uno::RuntimeException, std::exception) override; + sal_Int32 nNumberFormatKey, sal_Int32 nFormulaLength ) override; virtual void SAL_CALL setXYNames( - const OUString& aXName, const OUString& aYName ) - throw (css::uno::RuntimeException, std::exception) override; + const OUString& aXName, const OUString& aYName ) override; }; } // namespace chart diff --git a/chart2/source/inc/Scaling.hxx b/chart2/source/inc/Scaling.hxx index 3b1b4ef14b05..b04d48bc1d4c 100644 --- a/chart2/source/inc/Scaling.hxx +++ b/chart2/source/inc/Scaling.hxx @@ -45,24 +45,19 @@ public: virtual ~LogarithmicScaling() override; /// declare XServiceInfo methods - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // ____ XScaling ____ - virtual double SAL_CALL doScaling( double value ) - throw (css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL doScaling( double value ) override; virtual css::uno::Reference< css::chart2::XScaling > SAL_CALL - getInverseScaling() throw (css::uno::RuntimeException, std::exception) override; + getInverseScaling() override; // ____ XServiceName ____ - virtual OUString SAL_CALL getServiceName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; private: const double m_fBase; @@ -83,24 +78,19 @@ public: virtual ~ExponentialScaling() override; /// declare XServiceInfo methods - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // ____ XScaling ____ virtual double SAL_CALL - doScaling( double value ) - throw (css::uno::RuntimeException, std::exception) override; + doScaling( double value ) override; virtual css::uno::Reference< css::chart2::XScaling > SAL_CALL - getInverseScaling() throw (css::uno::RuntimeException, std::exception) override; + getInverseScaling() override; // ____ XServiceName ____ - virtual OUString SAL_CALL getServiceName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; private: const double m_fBase; @@ -120,23 +110,18 @@ public: virtual ~LinearScaling() override; /// declare XServiceInfo methods - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // ____ XScaling ____ - virtual double SAL_CALL doScaling( double value ) - throw (css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL doScaling( double value ) override; virtual css::uno::Reference< css::chart2::XScaling > SAL_CALL - getInverseScaling() throw (css::uno::RuntimeException, std::exception) override; + getInverseScaling() override; // ____ XServiceName ____ - virtual OUString SAL_CALL getServiceName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; private: const double m_fSlope; @@ -156,24 +141,19 @@ public: virtual ~PowerScaling() override; /// declare XServiceInfo methods - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // ____ XScaling ____ virtual double SAL_CALL - doScaling( double value ) - throw (css::uno::RuntimeException, std::exception) override; + doScaling( double value ) override; virtual css::uno::Reference< css::chart2::XScaling > SAL_CALL - getInverseScaling() throw (css::uno::RuntimeException, std::exception) override; + getInverseScaling() override; // ____ XServiceName ____ - virtual OUString SAL_CALL getServiceName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; private: const double m_fExponent; diff --git a/chart2/source/inc/UncachedDataSequence.hxx b/chart2/source/inc/UncachedDataSequence.hxx index bea4028d36d9..3077586c3803 100644 --- a/chart2/source/inc/UncachedDataSequence.hxx +++ b/chart2/source/inc/UncachedDataSequence.hxx @@ -91,12 +91,9 @@ public: virtual ~UncachedDataSequence() override; /// declare XServiceInfo methods - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; /// merge XInterface implementations DECLARE_XINTERFACE() @@ -106,78 +103,54 @@ public: protected: // ____ XPropertySet ____ /// @see css::beans::XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo() override; /// @see ::comphelper::OPropertySetHelper virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; /// @see ::comphelper::OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override; // ____ XDataSequence ____ - virtual css::uno::Sequence< css::uno::Any > SAL_CALL getData() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSourceRangeRepresentation() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getData() override; + virtual OUString SAL_CALL getSourceRangeRepresentation() override; virtual css::uno::Sequence< OUString > SAL_CALL generateLabel( - css::chart2::data::LabelOrigin nLabelOrigin ) - throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + css::chart2::data::LabelOrigin nLabelOrigin ) override; + virtual ::sal_Int32 SAL_CALL getNumberFormatKeyByIndex( ::sal_Int32 nIndex ) override; // ____ XNumericalDataSequence ____ /// @see css::chart::data::XNumericalDataSequence - virtual css::uno::Sequence< double > SAL_CALL getNumericalData() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< double > SAL_CALL getNumericalData() override; // ____ XTextualDataSequence ____ /// @see css::chart::data::XTextualDataSequence - virtual css::uno::Sequence< OUString > SAL_CALL getTextualData() throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getTextualData() override; // ____ XIndexReplace ____ - virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) - throw (css::lang::IllegalArgumentException, - css::lang::IndexOutOfBoundsException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByIndex( ::sal_Int32 Index, const css::uno::Any& Element ) override; // ____ XIndexAccess (base of XIndexReplace) ____ - virtual ::sal_Int32 SAL_CALL getCount() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) - throw (css::lang::IndexOutOfBoundsException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getCount() override; + virtual css::uno::Any SAL_CALL getByIndex( ::sal_Int32 Index ) override; // ____ XElementAccess (base of XIndexAccess) ____ - virtual css::uno::Type SAL_CALL getElementType() - throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() override; // ____ XNamed (for setting a new range representation) ____ - virtual OUString SAL_CALL getName() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName( const OUString& aName ) override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; // ____ XModifiable ____ - virtual sal_Bool SAL_CALL isModified() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setModified( sal_Bool bModified ) - throw (css::beans::PropertyVetoException, - css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isModified() override; + virtual void SAL_CALL setModified( sal_Bool bModified ) override; // ____ XModifyBroadcaster (base of XModifiable) ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; void fireModifyEvent(); diff --git a/chart2/source/inc/WeakListenerAdapter.hxx b/chart2/source/inc/WeakListenerAdapter.hxx index 9bbff96bc079..10b3b6357d94 100644 --- a/chart2/source/inc/WeakListenerAdapter.hxx +++ b/chart2/source/inc/WeakListenerAdapter.hxx @@ -56,8 +56,7 @@ public: protected: // ____ XEventListener (base of all listeners) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException) SAL_OVERRIDE + const css::lang::EventObject& Source ) SAL_OVERRIDE { css::uno::Reference< css::lang::XEventListener > xEventListener( css::uno::Reference< Listener >( m_xListener), css::uno::UNO_QUERY ); @@ -84,8 +83,7 @@ public: protected: // ____ XModifyListener ____ - virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL modified( const css::lang::EventObject& aEvent ) override; }; class WeakSelectionChangeListenerAdapter : @@ -99,8 +97,7 @@ public: protected: // ____ XSelectionChangeListener ____ virtual void SAL_CALL selectionChanged( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; }; } // namespace chart diff --git a/chart2/source/inc/WrappedDefaultProperty.hxx b/chart2/source/inc/WrappedDefaultProperty.hxx index f0a9fed217ed..a3632118171d 100644 --- a/chart2/source/inc/WrappedDefaultProperty.hxx +++ b/chart2/source/inc/WrappedDefaultProperty.hxx @@ -34,20 +34,13 @@ public: virtual ~WrappedDefaultProperty() override; virtual void setPropertyToDefault( - const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException) override; + const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; virtual css::uno::Any getPropertyDefault( - const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException) override; + const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; virtual css::beans::PropertyState getPropertyState( - const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException) override; + const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; private: css::uno::Any m_aOuterDefaultValue; }; diff --git a/chart2/source/inc/WrappedDirectStateProperty.hxx b/chart2/source/inc/WrappedDirectStateProperty.hxx index 1c97aa0a5cb8..ba2bc0aac459 100644 --- a/chart2/source/inc/WrappedDirectStateProperty.hxx +++ b/chart2/source/inc/WrappedDirectStateProperty.hxx @@ -34,9 +34,7 @@ public: virtual ~WrappedDirectStateProperty() override; virtual css::beans::PropertyState getPropertyState( - const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException) override; + const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; }; } // namespace chart diff --git a/chart2/source/inc/WrappedIgnoreProperty.hxx b/chart2/source/inc/WrappedIgnoreProperty.hxx index 70f0c37c9862..14bf3ddf514d 100644 --- a/chart2/source/inc/WrappedIgnoreProperty.hxx +++ b/chart2/source/inc/WrappedIgnoreProperty.hxx @@ -33,20 +33,15 @@ public: WrappedIgnoreProperty( const OUString& rOuterName, const css::uno::Any& rDefaultValue ); virtual ~WrappedIgnoreProperty() override; - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const override; -SAL_DLLPRIVATE virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override; +SAL_DLLPRIVATE virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; -SAL_DLLPRIVATE virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException) override; +SAL_DLLPRIVATE virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; -SAL_DLLPRIVATE virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override; +SAL_DLLPRIVATE virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const override; protected: css::uno::Any m_aDefaultValue; diff --git a/chart2/source/inc/WrappedProperty.hxx b/chart2/source/inc/WrappedProperty.hxx index c22a0cb828ef..d28b83e7c8a2 100644 --- a/chart2/source/inc/WrappedProperty.hxx +++ b/chart2/source/inc/WrappedProperty.hxx @@ -45,30 +45,25 @@ public: /// @throws css::lang::IllegalArgumentException /// @throws css::lang::WrappedTargetException /// @throws css::uno::RuntimeException - virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual void setPropertyValue( const css::uno::Any& rOuterValue, const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const; /// @throws css::beans::UnknownPropertyException /// @throws css::lang::WrappedTargetException /// @throws css::uno::RuntimeException - virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual css::uno::Any getPropertyValue( const css::uno::Reference< css::beans::XPropertySet >& xInnerPropertySet ) const; /// @throws css::beans::UnknownPropertyException /// @throws css::uno::RuntimeException - virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException); + virtual void setPropertyToDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const; /// @throws css::beans::UnknownPropertyException /// @throws css::lang::WrappedTargetException /// @throws css::uno::RuntimeException - virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException); + virtual css::uno::Any getPropertyDefault( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const; /// @throws css::beans::UnknownPropertyException /// @throws css::uno::RuntimeException - virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException); + virtual css::beans::PropertyState getPropertyState( const css::uno::Reference< css::beans::XPropertyState >& xInnerPropertyState ) const; protected: virtual css::uno::Any convertInnerToOuterValue( const css::uno::Any& rInnerValue ) const; diff --git a/chart2/source/inc/WrappedPropertySet.hxx b/chart2/source/inc/WrappedPropertySet.hxx index cd2c89937e84..5f9f703430d4 100644 --- a/chart2/source/inc/WrappedPropertySet.hxx +++ b/chart2/source/inc/WrappedPropertySet.hxx @@ -53,35 +53,35 @@ public: public: //XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; //XMultiPropertySet //getPropertySetInfo() already declared in XPropertySet - virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Sequence< css::uno::Any >& aValues ) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames ) override; + virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; + virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; //XPropertyState - virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::beans::PropertyState SAL_CALL getPropertyState( const OUString& PropertyName ) override; + virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< OUString >& aPropertyName ) override; + virtual void SAL_CALL setPropertyToDefault( const OUString& PropertyName ) override; + virtual css::uno::Any SAL_CALL getPropertyDefault( const OUString& aPropertyName ) override; //XMultiPropertyStates //getPropertyStates() already declared in XPropertyState - virtual void SAL_CALL setAllPropertiesToDefault( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setAllPropertiesToDefault( ) override; + virtual void SAL_CALL setPropertiesToDefault( const css::uno::Sequence< OUString >& aPropertyNames ) override; + virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyDefaults( const css::uno::Sequence< OUString >& aPropertyNames ) override; protected: //methods /** give all the properties that should be visible to the outer side diff --git a/chart2/source/model/filter/XMLFilter.cxx b/chart2/source/model/filter/XMLFilter.cxx index 019dd864a402..11e1a6bc57a0 100644 --- a/chart2/source/model/filter/XMLFilter.cxx +++ b/chart2/source/model/filter/XMLFilter.cxx @@ -195,7 +195,6 @@ XMLFilter::~XMLFilter() // ____ XFilter ____ sal_Bool SAL_CALL XMLFilter::filter( const Sequence< beans::PropertyValue >& aDescriptor ) - throw (uno::RuntimeException, std::exception) { bool bResult = false; @@ -234,7 +233,6 @@ sal_Bool SAL_CALL XMLFilter::filter( } void SAL_CALL XMLFilter::cancel() - throw (uno::RuntimeException, std::exception) { // if mutex is locked set "cancel state" // note: is currently ignored in filter-method @@ -247,8 +245,6 @@ void SAL_CALL XMLFilter::cancel() // ____ XImporter ____ void SAL_CALL XMLFilter::setTargetDocument( const Reference< lang::XComponent >& Document ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); OSL_ENSURE( ! m_xSourceDoc.is(), "Setting target doc while source doc is set" ); @@ -259,8 +255,6 @@ void SAL_CALL XMLFilter::setTargetDocument( // ____ XExporter ____ void SAL_CALL XMLFilter::setSourceDocument( const Reference< lang::XComponent >& Document ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); OSL_ENSURE( ! m_xTargetDoc.is(), "Setting source doc while target doc is set" ); @@ -744,19 +738,16 @@ OUString XMLFilter::getMediaType(bool _bOasis) } OUString SAL_CALL XMLFilter::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart2.XMLFilter"); } sal_Bool SAL_CALL XMLFilter::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL XMLFilter::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.document.ImportFilter", diff --git a/chart2/source/model/inc/BaseCoordinateSystem.hxx b/chart2/source/model/inc/BaseCoordinateSystem.hxx index ab73022b468b..73d7bf87a7a7 100644 --- a/chart2/source/model/inc/BaseCoordinateSystem.hxx +++ b/chart2/source/model/inc/BaseCoordinateSystem.hxx @@ -61,15 +61,13 @@ public: virtual ~BaseCoordinateSystem() override; // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; /// merge XInterface implementations DECLARE_XINTERFACE() @@ -78,55 +76,37 @@ public: protected: // ____ XCoordinateSystem ____ - virtual ::sal_Int32 SAL_CALL getDimension() - throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getDimension() override; virtual void SAL_CALL setAxisByDimension( ::sal_Int32 nDimension, const css::uno::Reference< css::chart2::XAxis >& xAxis, - ::sal_Int32 nIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + ::sal_Int32 nIndex ) override; virtual css::uno::Reference< css::chart2::XAxis > SAL_CALL getAxisByDimension( - ::sal_Int32 nDimension, ::sal_Int32 nIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getMaximumAxisIndexByDimension( ::sal_Int32 nDimension ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; + ::sal_Int32 nDimension, ::sal_Int32 nIndex ) override; + virtual ::sal_Int32 SAL_CALL getMaximumAxisIndexByDimension( ::sal_Int32 nDimension ) override; // ____ XChartTypeContainer ____ virtual void SAL_CALL addChartType( - const css::uno::Reference< css::chart2::XChartType >& aChartType ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XChartType >& aChartType ) override; virtual void SAL_CALL removeChartType( - const css::uno::Reference< css::chart2::XChartType >& aChartType ) - throw (css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > > SAL_CALL getChartTypes() - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XChartType >& aChartType ) override; + virtual css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > > SAL_CALL getChartTypes() override; virtual void SAL_CALL setChartTypes( - const css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > >& aChartTypes ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > >& aChartTypes ) override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // ____ XModifyListener ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; // ____ OPropertySet ____ virtual void firePropertyChangeEvent() override; diff --git a/chart2/source/model/inc/CartesianCoordinateSystem.hxx b/chart2/source/model/inc/CartesianCoordinateSystem.hxx index 79aac4c21bb1..75d9aa2288b7 100644 --- a/chart2/source/model/inc/CartesianCoordinateSystem.hxx +++ b/chart2/source/model/inc/CartesianCoordinateSystem.hxx @@ -34,22 +34,16 @@ public: virtual ~CartesianCoordinateSystem() override; // ____ XCoordinateSystem ____ - virtual OUString SAL_CALL getCoordinateSystemType() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getViewServiceName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getCoordinateSystemType() override; + virtual OUString SAL_CALL getViewServiceName() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; // ____ XServiceInfo ____ - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; class CartesianCoordinateSystem2d : public CartesianCoordinateSystem @@ -60,12 +54,9 @@ public: virtual ~CartesianCoordinateSystem2d() override; // ____ XServiceInfo ____ - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; class CartesianCoordinateSystem3d : public CartesianCoordinateSystem @@ -77,12 +68,9 @@ public: virtual ~CartesianCoordinateSystem3d() override; // ____ XServiceInfo ____ - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; } // namespace chart diff --git a/chart2/source/model/inc/ChartTypeManager.hxx b/chart2/source/model/inc/ChartTypeManager.hxx index 30e2b24cffb1..2a49620e1dfd 100644 --- a/chart2/source/model/inc/ChartTypeManager.hxx +++ b/chart2/source/model/inc/ChartTypeManager.hxx @@ -45,29 +45,21 @@ public: virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; protected: // ____ XMultiServiceFactory ____ - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) - throw (css::uno::Exception, - css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( const OUString& aServiceSpecifier ) override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( const OUString& ServiceSpecifier, - const css::uno::Sequence< css::uno::Any >& Arguments ) - throw (css::uno::Exception, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Any >& Arguments ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAvailableServiceNames() override; // ____ XChartTypeManager ____ // currently empty diff --git a/chart2/source/model/inc/DataSeries.hxx b/chart2/source/model/inc/DataSeries.hxx index 7cac9977dfb7..3c477e0afefe 100644 --- a/chart2/source/model/inc/DataSeries.hxx +++ b/chart2/source/model/inc/DataSeries.hxx @@ -71,12 +71,9 @@ public: virtual ~DataSeries() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; /// merge XInterface implementations DECLARE_XINTERFACE() @@ -92,41 +89,31 @@ protected: // ____ XDataSeries ____ /// @see css::chart2::XDataSeries virtual css::uno::Reference< css::beans::XPropertySet > - SAL_CALL getDataPointByIndex( sal_Int32 nIndex ) - throw (css::lang::IndexOutOfBoundsException, - css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL resetDataPoint( sal_Int32 nIndex ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL resetAllDataPoints() - throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getDataPointByIndex( sal_Int32 nIndex ) override; + virtual void SAL_CALL resetDataPoint( sal_Int32 nIndex ) override; + virtual void SAL_CALL resetAllDataPoints() override; // ____ XDataSink ____ /// @see css::chart2::data::XDataSink - virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > >& aData ) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setData( const css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > >& aData ) override; // ____ XDataSource ____ /// @see css::chart2::data::XDataSource - virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::chart2::data::XLabeledDataSequence > > SAL_CALL getDataSequences() override; // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast ( sal_Int32 nHandle, - const css::uno::Any& rValue ) - throw (css::uno::Exception, std::exception) override; + const css::uno::Any& rValue ) override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ /// @see css::beans::XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; /// make original interface function visible again using ::com::sun::star::beans::XFastPropertySet::getFastPropertyValue; @@ -134,40 +121,29 @@ protected: // ____ XRegressionCurveContainer ____ /// @see css::chart2::XRegressionCurveContainer virtual void SAL_CALL addRegressionCurve( - const css::uno::Reference< css::chart2::XRegressionCurve >& aRegressionCurve ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XRegressionCurve >& aRegressionCurve ) override; virtual void SAL_CALL removeRegressionCurve( - const css::uno::Reference< css::chart2::XRegressionCurve >& aRegressionCurve ) - throw (css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Reference< css::chart2::XRegressionCurve > > SAL_CALL getRegressionCurves() - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XRegressionCurve >& aRegressionCurve ) override; + virtual css::uno::Sequence< css::uno::Reference< css::chart2::XRegressionCurve > > SAL_CALL getRegressionCurves() override; virtual void SAL_CALL setRegressionCurves( - const css::uno::Sequence< css::uno::Reference< css::chart2::XRegressionCurve > >& aRegressionCurves ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Reference< css::chart2::XRegressionCurve > >& aRegressionCurves ) override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // ____ XModifyListener ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; // ____ OPropertySet ____ virtual void firePropertyChangeEvent() override; diff --git a/chart2/source/model/inc/Diagram.hxx b/chart2/source/model/inc/Diagram.hxx index 7e724184ba1e..88023bb1f0d6 100644 --- a/chart2/source/model/inc/Diagram.hxx +++ b/chart2/source/model/inc/Diagram.hxx @@ -65,12 +65,9 @@ public: virtual ~Diagram() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; /// merge XInterface implementations DECLARE_XINTERFACE() @@ -81,20 +78,17 @@ protected: explicit Diagram( const Diagram & rOther ); // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; // ____ OPropertySet ____ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XFastPropertySet ____ - virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue ) - throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setFastPropertyValue( sal_Int32 nHandle, const css::uno::Any& rValue ) override; /// make original interface function visible again using ::com::sun::star::beans::XFastPropertySet::getFastPropertyValue; @@ -103,75 +97,54 @@ protected: css::uno::Any& rValue, sal_Int32 nHandle ) const override; // ____ XDiagram ____ - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getWall() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getFloor() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::chart2::XLegend > SAL_CALL getLegend() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getWall() override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getFloor() override; + virtual css::uno::Reference< css::chart2::XLegend > SAL_CALL getLegend() override; virtual void SAL_CALL setLegend( const css::uno::Reference< - css::chart2::XLegend >& xLegend ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::chart2::XColorScheme > SAL_CALL getDefaultColorScheme() - throw (css::uno::RuntimeException, std::exception) override; + css::chart2::XLegend >& xLegend ) override; + virtual css::uno::Reference< css::chart2::XColorScheme > SAL_CALL getDefaultColorScheme() override; virtual void SAL_CALL setDefaultColorScheme( - const css::uno::Reference< css::chart2::XColorScheme >& xColorScheme ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XColorScheme >& xColorScheme ) override; virtual void SAL_CALL setDiagramData( const css::uno::Reference< css::chart2::data::XDataSource >& xDataSource, - const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) override; // ____ XCoordinateSystemContainer ____ virtual void SAL_CALL addCoordinateSystem( - const css::uno::Reference< css::chart2::XCoordinateSystem >& aCoordSys ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XCoordinateSystem >& aCoordSys ) override; virtual void SAL_CALL removeCoordinateSystem( - const css::uno::Reference< css::chart2::XCoordinateSystem >& aCoordSys ) - throw (css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Reference< css::chart2::XCoordinateSystem > > SAL_CALL getCoordinateSystems() - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XCoordinateSystem >& aCoordSys ) override; + virtual css::uno::Sequence< css::uno::Reference< css::chart2::XCoordinateSystem > > SAL_CALL getCoordinateSystems() override; virtual void SAL_CALL setCoordinateSystems( - const css::uno::Sequence< css::uno::Reference< css::chart2::XCoordinateSystem > >& aCoordinateSystems ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Reference< css::chart2::XCoordinateSystem > >& aCoordinateSystems ) override; // ____ XTitled ____ virtual css::uno::Reference< - css::chart2::XTitle > SAL_CALL getTitleObject() - throw (css::uno::RuntimeException, std::exception) override; + css::chart2::XTitle > SAL_CALL getTitleObject() override; virtual void SAL_CALL setTitleObject( const css::uno::Reference< - css::chart2::XTitle >& Title ) - throw (css::uno::RuntimeException, std::exception) override; + css::chart2::XTitle >& Title ) override; // ____ X3DDefaultSetter ____ - virtual void SAL_CALL set3DSettingsToDefault() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDefaultRotation() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDefaultIllumination() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL set3DSettingsToDefault() override; + virtual void SAL_CALL setDefaultRotation() override; + virtual void SAL_CALL setDefaultIllumination() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // ____ XModifyListener ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; // ____ OPropertySet ____ virtual void firePropertyChangeEvent() override; diff --git a/chart2/source/model/inc/PolarCoordinateSystem.hxx b/chart2/source/model/inc/PolarCoordinateSystem.hxx index f886d066895f..f4d86ee18311 100644 --- a/chart2/source/model/inc/PolarCoordinateSystem.hxx +++ b/chart2/source/model/inc/PolarCoordinateSystem.hxx @@ -34,22 +34,16 @@ public: virtual ~PolarCoordinateSystem() override; // ____ XCoordinateSystem ____ - virtual OUString SAL_CALL getCoordinateSystemType() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getViewServiceName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getCoordinateSystemType() override; + virtual OUString SAL_CALL getViewServiceName() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; // ____ XServiceInfo ____ - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; class PolarCoordinateSystem2d : public PolarCoordinateSystem @@ -60,12 +54,9 @@ public: virtual ~PolarCoordinateSystem2d() override; // ____ XServiceInfo ____ - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; class PolarCoordinateSystem3d : public PolarCoordinateSystem @@ -76,12 +67,9 @@ public: virtual ~PolarCoordinateSystem3d() override; // ____ XServiceInfo ____ - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; } // namespace chart diff --git a/chart2/source/model/inc/StockBar.hxx b/chart2/source/model/inc/StockBar.hxx index 40cf1f2ac212..7401a98e4374 100644 --- a/chart2/source/model/inc/StockBar.hxx +++ b/chart2/source/model/inc/StockBar.hxx @@ -56,37 +56,30 @@ protected: explicit StockBar( const StockBar & rOther ); // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // ____ XModifyListener ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; // ____ OPropertySet ____ virtual void firePropertyChangeEvent() override; diff --git a/chart2/source/model/inc/XMLFilter.hxx b/chart2/source/model/inc/XMLFilter.hxx index bc8b75ee4a2d..00aa0279d970 100644 --- a/chart2/source/model/inc/XMLFilter.hxx +++ b/chart2/source/model/inc/XMLFilter.hxx @@ -62,32 +62,23 @@ public: virtual ~XMLFilter() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; protected: // ____ XFilter ____ virtual sal_Bool SAL_CALL filter( - const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL cancel() - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& aDescriptor ) override; + virtual void SAL_CALL cancel() override; // ____ XImporter ____ virtual void SAL_CALL setTargetDocument( - const css::uno::Reference< css::lang::XComponent >& Document ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::lang::XComponent >& Document ) override; // ____ XExporter ____ virtual void SAL_CALL setSourceDocument( - const css::uno::Reference< css::lang::XComponent >& Document ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::lang::XComponent >& Document ) override; inline void setDocumentHandler(const OUString& _sDocumentHandler) { m_sDocumentHandler = _sDocumentHandler; } @@ -151,16 +142,13 @@ public: {} protected: virtual OUString SAL_CALL - getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override + getImplementationName() override { return OUString( "com.sun.star.comp.chart2.report.XMLFilter" ); } // ____ XImporter ____ virtual void SAL_CALL setTargetDocument( - const css::uno::Reference< css::lang::XComponent >& Document ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override + const css::uno::Reference< css::lang::XComponent >& Document ) override { setDocumentHandler( "com.sun.star.comp.report.ImportDocumentHandler" ); XMLFilter::setTargetDocument(Document); @@ -168,9 +156,7 @@ protected: // ____ XExporter ____ virtual void SAL_CALL setSourceDocument( - const css::uno::Reference< css::lang::XComponent >& Document ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override + const css::uno::Reference< css::lang::XComponent >& Document ) override { setDocumentHandler( "com.sun.star.comp.report.ExportDocumentHandler" ); XMLFilter::setSourceDocument(Document); diff --git a/chart2/source/model/main/Axis.cxx b/chart2/source/model/main/Axis.cxx index 8ba10b145626..b4ab8bd6389e 100644 --- a/chart2/source/model/main/Axis.cxx +++ b/chart2/source/model/main/Axis.cxx @@ -459,7 +459,6 @@ void Axis::AllocateSubGrids() // ____ XAxis ____ void SAL_CALL Axis::setScaleData( const chart2::ScaleData& rScaleData ) - throw (uno::RuntimeException, std::exception) { Reference< util::XModifyListener > xModifyEventForwarder; Reference< lang::XEventListener > xEventListener; @@ -489,27 +488,23 @@ void SAL_CALL Axis::setScaleData( const chart2::ScaleData& rScaleData ) } chart2::ScaleData SAL_CALL Axis::getScaleData() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); return m_aScaleData; } Reference< beans::XPropertySet > SAL_CALL Axis::getGridProperties() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); return m_xGrid; } Sequence< Reference< beans::XPropertySet > > SAL_CALL Axis::getSubGridProperties() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); return m_aSubGridProperties; } Sequence< Reference< beans::XPropertySet > > SAL_CALL Axis::getSubTickProperties() - throw (uno::RuntimeException, std::exception) { OSL_FAIL( "Not implemented yet" ); return Sequence< Reference< beans::XPropertySet > >(); @@ -517,14 +512,12 @@ Sequence< Reference< beans::XPropertySet > > SAL_CALL Axis::getSubTickProperties // ____ XTitled ____ Reference< chart2::XTitle > SAL_CALL Axis::getTitleObject() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); return m_xTitle; } void SAL_CALL Axis::setTitleObject( const Reference< chart2::XTitle >& xNewTitle ) - throw (uno::RuntimeException, std::exception) { Reference< util::XModifyListener > xModifyEventForwarder; Reference< chart2::XTitle > xOldTitle; @@ -545,7 +538,6 @@ void SAL_CALL Axis::setTitleObject( const Reference< chart2::XTitle >& xNewTitle // ____ XCloneable ____ Reference< util::XCloneable > SAL_CALL Axis::createClone() - throw (uno::RuntimeException, std::exception) { Axis * pNewAxis( new Axis( *this )); // hold a reference to the clone @@ -557,7 +549,6 @@ Reference< util::XCloneable > SAL_CALL Axis::createClone() // ____ XModifyBroadcaster ____ void SAL_CALL Axis::addModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -571,7 +562,6 @@ void SAL_CALL Axis::addModifyListener( const Reference< util::XModifyListener >& } void SAL_CALL Axis::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -586,14 +576,12 @@ void SAL_CALL Axis::removeModifyListener( const Reference< util::XModifyListener // ____ XModifyListener ____ void SAL_CALL Axis::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { m_xModifyEventForwarder->modified( aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL Axis::disposing( const lang::EventObject& Source ) - throw (uno::RuntimeException, std::exception) { if( Source.Source == m_aScaleData.Categories ) m_aScaleData.Categories = nullptr; @@ -612,7 +600,6 @@ void Axis::fireModifyEvent() // ____ OPropertySet ____ uno::Any Axis::GetDefaultValue( sal_Int32 nHandle ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) { const tPropertyValueMap& rStaticDefaults = *StaticAxisDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -628,7 +615,6 @@ uno::Any Axis::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL Axis::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticAxisInfo::get(); } @@ -640,19 +626,16 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( Axis, Axis_Base, ::property::OPropertySet ) // implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL Axis::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart2.Axis"); } sal_Bool SAL_CALL Axis::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL Axis::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart2.Axis", diff --git a/chart2/source/model/main/Axis.hxx b/chart2/source/model/main/Axis.hxx index 6758b92d45b4..5ec250fc36b2 100644 --- a/chart2/source/model/main/Axis.hxx +++ b/chart2/source/model/main/Axis.hxx @@ -58,12 +58,9 @@ public: virtual ~Axis() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; /// merge XInterface implementations DECLARE_XINTERFACE() @@ -77,59 +74,44 @@ protected: void Init( const Axis & rOther ); // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; // ____ OPropertySet ____ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XAxis ____ - virtual void SAL_CALL setScaleData( const css::chart2::ScaleData& rScaleData ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::chart2::ScaleData SAL_CALL getScaleData() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getGridProperties() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Reference< css::beans::XPropertySet > > SAL_CALL getSubGridProperties() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Reference< css::beans::XPropertySet > > SAL_CALL getSubTickProperties() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setScaleData( const css::chart2::ScaleData& rScaleData ) override; + virtual css::chart2::ScaleData SAL_CALL getScaleData() override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getGridProperties() override; + virtual css::uno::Sequence< css::uno::Reference< css::beans::XPropertySet > > SAL_CALL getSubGridProperties() override; + virtual css::uno::Sequence< css::uno::Reference< css::beans::XPropertySet > > SAL_CALL getSubTickProperties() override; // ____ XTitled ____ - virtual css::uno::Reference< css::chart2::XTitle > SAL_CALL getTitleObject() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::XTitle > SAL_CALL getTitleObject() override; virtual void SAL_CALL setTitleObject( - const css::uno::Reference< css::chart2::XTitle >& Title ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XTitle >& Title ) override; // ____ XCloneable ____ // Note: the coordinate systems are not cloned! - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // ____ XModifyListener ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; // ____ OPropertySet ____ virtual void firePropertyChangeEvent() override; diff --git a/chart2/source/model/main/BaseCoordinateSystem.cxx b/chart2/source/model/main/BaseCoordinateSystem.cxx index 6a10d8404327..04babbc036dd 100644 --- a/chart2/source/model/main/BaseCoordinateSystem.cxx +++ b/chart2/source/model/main/BaseCoordinateSystem.cxx @@ -191,7 +191,6 @@ BaseCoordinateSystem::~BaseCoordinateSystem() // ____ XCoordinateSystem ____ sal_Int32 SAL_CALL BaseCoordinateSystem::getDimension() - throw (uno::RuntimeException, std::exception) { return m_nDimensionCount; } @@ -200,8 +199,6 @@ void SAL_CALL BaseCoordinateSystem::setAxisByDimension( sal_Int32 nDimensionIndex, const Reference< chart2::XAxis >& xAxis, sal_Int32 nIndex ) - throw (lang::IndexOutOfBoundsException, - uno::RuntimeException, std::exception) { if( nDimensionIndex < 0 || nDimensionIndex >= getDimension() ) throw lang::IndexOutOfBoundsException(); @@ -226,8 +223,6 @@ void SAL_CALL BaseCoordinateSystem::setAxisByDimension( Reference< chart2::XAxis > SAL_CALL BaseCoordinateSystem::getAxisByDimension( sal_Int32 nDimensionIndex, sal_Int32 nAxisIndex ) - throw (lang::IndexOutOfBoundsException, - uno::RuntimeException, std::exception) { if( nDimensionIndex < 0 || nDimensionIndex >= getDimension() ) throw lang::IndexOutOfBoundsException(); @@ -241,8 +236,6 @@ Reference< chart2::XAxis > SAL_CALL BaseCoordinateSystem::getAxisByDimension( } sal_Int32 SAL_CALL BaseCoordinateSystem::getMaximumAxisIndexByDimension( sal_Int32 nDimensionIndex ) - throw (lang::IndexOutOfBoundsException, - uno::RuntimeException, std::exception) { if( nDimensionIndex < 0 || nDimensionIndex >= getDimension() ) throw lang::IndexOutOfBoundsException(); @@ -258,8 +251,6 @@ sal_Int32 SAL_CALL BaseCoordinateSystem::getMaximumAxisIndexByDimension( sal_Int // ____ XChartTypeContainer ____ void SAL_CALL BaseCoordinateSystem::addChartType( const Reference< chart2::XChartType >& aChartType ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { if( ::std::find( m_aChartTypes.begin(), m_aChartTypes.end(), aChartType ) != m_aChartTypes.end()) @@ -271,8 +262,6 @@ void SAL_CALL BaseCoordinateSystem::addChartType( const Reference< chart2::XChar } void SAL_CALL BaseCoordinateSystem::removeChartType( const Reference< chart2::XChartType >& aChartType ) - throw (container::NoSuchElementException, - uno::RuntimeException, std::exception) { ::std::vector< uno::Reference< chart2::XChartType > >::iterator aIt( ::std::find( m_aChartTypes.begin(), m_aChartTypes.end(), aChartType )); @@ -287,14 +276,11 @@ void SAL_CALL BaseCoordinateSystem::removeChartType( const Reference< chart2::XC } Sequence< Reference< chart2::XChartType > > SAL_CALL BaseCoordinateSystem::getChartTypes() - throw (uno::RuntimeException, std::exception) { return comphelper::containerToSequence( m_aChartTypes ); } void SAL_CALL BaseCoordinateSystem::setChartTypes( const Sequence< Reference< chart2::XChartType > >& aChartTypes ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { ModifyListenerHelper::removeListenerFromAllElements( m_aChartTypes, m_xModifyEventForwarder ); m_aChartTypes = ContainerHelper::SequenceToVector( aChartTypes ); @@ -304,7 +290,6 @@ void SAL_CALL BaseCoordinateSystem::setChartTypes( const Sequence< Reference< ch // ____ XModifyBroadcaster ____ void SAL_CALL BaseCoordinateSystem::addModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -318,7 +303,6 @@ void SAL_CALL BaseCoordinateSystem::addModifyListener( const Reference< util::XM } void SAL_CALL BaseCoordinateSystem::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -333,14 +317,12 @@ void SAL_CALL BaseCoordinateSystem::removeModifyListener( const Reference< util: // ____ XModifyListener ____ void SAL_CALL BaseCoordinateSystem::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { m_xModifyEventForwarder->modified( aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL BaseCoordinateSystem::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException, std::exception) { // nothing } @@ -358,7 +340,6 @@ void BaseCoordinateSystem::fireModifyEvent() // ____ OPropertySet ____ uno::Any BaseCoordinateSystem::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticCooSysDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -375,7 +356,6 @@ uno::Any BaseCoordinateSystem::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL BaseCoordinateSystem::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticCooSysInfo::get(); } diff --git a/chart2/source/model/main/CartesianCoordinateSystem.cxx b/chart2/source/model/main/CartesianCoordinateSystem.cxx index 5befaffb9748..156b6cce6b53 100644 --- a/chart2/source/model/main/CartesianCoordinateSystem.cxx +++ b/chart2/source/model/main/CartesianCoordinateSystem.cxx @@ -55,39 +55,33 @@ CartesianCoordinateSystem::~CartesianCoordinateSystem() // ____ XCoordinateSystem ____ OUString SAL_CALL CartesianCoordinateSystem::getCoordinateSystemType() - throw (RuntimeException, std::exception) { return OUString(CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME); } OUString SAL_CALL CartesianCoordinateSystem::getViewServiceName() - throw (RuntimeException, std::exception) { return OUString(CHART2_COOSYSTEM_CARTESIAN_VIEW_SERVICE_NAME); } // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL CartesianCoordinateSystem::createClone() - throw (RuntimeException, std::exception) { return Reference< util::XCloneable >( new CartesianCoordinateSystem( *this )); } // ____ XServiceInfo ____ OUString SAL_CALL CartesianCoordinateSystem::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.CartesianCoordinateSystem"); } sal_Bool SAL_CALL CartesianCoordinateSystem::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL CartesianCoordinateSystem::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME }; } @@ -104,19 +98,16 @@ CartesianCoordinateSystem2d::~CartesianCoordinateSystem2d() // ____ XServiceInfo ____ OUString SAL_CALL CartesianCoordinateSystem2d::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart2.CartesianCoordinateSystem2d"); } sal_Bool SAL_CALL CartesianCoordinateSystem2d::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL CartesianCoordinateSystem2d::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME, @@ -136,19 +127,16 @@ CartesianCoordinateSystem3d::~CartesianCoordinateSystem3d() // ____ XServiceInfo ____ OUString SAL_CALL CartesianCoordinateSystem3d::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart2.CartesianCoordinateSystem3d"); } sal_Bool SAL_CALL CartesianCoordinateSystem3d::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL CartesianCoordinateSystem3d::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CHART2_COOSYSTEM_CARTESIAN_SERVICE_NAME, diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx index 65717729a221..738c8807fa2f 100644 --- a/chart2/source/model/main/ChartModel.cxx +++ b/chart2/source/model/main/ChartModel.cxx @@ -193,7 +193,6 @@ ChartModel::~ChartModel() } void SAL_CALL ChartModel::initialize( const Sequence< Any >& /*rArguments*/ ) - throw (uno::Exception, uno::RuntimeException, std::exception) { //#i113722# avoid duplicate creation @@ -237,7 +236,7 @@ bool ChartModel::impl_isControllerConnected( const uno::Reference< frame::XContr return false; } -uno::Reference< frame::XController > ChartModel::impl_getCurrentController() throw(uno::RuntimeException) +uno::Reference< frame::XController > ChartModel::impl_getCurrentController() { //@todo? hold only weak references to controllers @@ -257,7 +256,6 @@ uno::Reference< frame::XController > ChartModel::impl_getCurrentController() thr } void SAL_CALL ChartModel::impl_notifyCloseListeners() - throw( uno::RuntimeException) { ::cppu::OInterfaceContainerHelper* pIC = m_aLifeTimeManager.m_aListenerContainer .getContainer( cppu::UnoType::get()); @@ -314,19 +312,16 @@ void ChartModel::impl_adjustAdditionalShapesPositionAndSize( const awt::Size& aV // lang::XServiceInfo OUString SAL_CALL ChartModel::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString(CHART_MODEL_SERVICE_IMPLEMENTATION_NAME); } sal_Bool SAL_CALL ChartModel::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL ChartModel::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CHART_MODEL_SERVICE_NAME, @@ -339,7 +334,6 @@ css::uno::Sequence< OUString > SAL_CALL ChartModel::getSupportedServiceNames() sal_Bool SAL_CALL ChartModel::attachResource( const OUString& rURL , const uno::Sequence< beans::PropertyValue >& rMediaDescriptor ) - throw(uno::RuntimeException, std::exception) { /* The method attachResource() is used by the frame loader implementations @@ -363,12 +357,12 @@ sal_Bool SAL_CALL ChartModel::attachResource( const OUString& rURL return true; } -OUString SAL_CALL ChartModel::getURL() throw(uno::RuntimeException, std::exception) +OUString SAL_CALL ChartModel::getURL() { return impl_g_getLocation(); } -uno::Sequence< beans::PropertyValue > SAL_CALL ChartModel::getArgs() throw(uno::RuntimeException, std::exception) +uno::Sequence< beans::PropertyValue > SAL_CALL ChartModel::getArgs() { /* The method getArgs() returns a sequence of property values @@ -385,7 +379,6 @@ uno::Sequence< beans::PropertyValue > SAL_CALL ChartModel::getArgs() throw(uno:: } void SAL_CALL ChartModel::connectController( const uno::Reference< frame::XController >& xController ) - throw(uno::RuntimeException, std::exception) { //@todo? this method is declared as oneway -> ...? @@ -399,7 +392,6 @@ void SAL_CALL ChartModel::connectController( const uno::Reference< frame::XContr } void SAL_CALL ChartModel::disconnectController( const uno::Reference< frame::XController >& xController ) - throw(uno::RuntimeException, std::exception) { //@todo? this method is declared as oneway -> ...? @@ -417,7 +409,7 @@ void SAL_CALL ChartModel::disconnectController( const uno::Reference< frame::XCo DisposeHelper::DisposeAndClear( m_xRangeHighlighter ); } -void SAL_CALL ChartModel::lockControllers() throw(uno::RuntimeException, std::exception) +void SAL_CALL ChartModel::lockControllers() { /* suspends some notifications to the controllers which are used for display updates. @@ -435,7 +427,7 @@ void SAL_CALL ChartModel::lockControllers() throw(uno::RuntimeException, std::ex ++m_nControllerLockCount; } -void SAL_CALL ChartModel::unlockControllers() throw(uno::RuntimeException, std::exception) +void SAL_CALL ChartModel::unlockControllers() { /* resumes the notifications which were suspended by lockControllers() . @@ -463,7 +455,7 @@ void SAL_CALL ChartModel::unlockControllers() throw(uno::RuntimeException, std:: } } -sal_Bool SAL_CALL ChartModel::hasControllersLocked() throw(uno::RuntimeException, std::exception) +sal_Bool SAL_CALL ChartModel::hasControllersLocked() { LifeTimeGuard aGuard(m_aLifeTimeManager); if(!aGuard.startApiCall()) @@ -471,7 +463,7 @@ sal_Bool SAL_CALL ChartModel::hasControllersLocked() throw(uno::RuntimeException return ( m_nControllerLockCount != 0 ) ; } -uno::Reference< frame::XController > SAL_CALL ChartModel::getCurrentController() throw(uno::RuntimeException, std::exception) +uno::Reference< frame::XController > SAL_CALL ChartModel::getCurrentController() { LifeTimeGuard aGuard(m_aLifeTimeManager); if(!aGuard.startApiCall()) @@ -483,7 +475,6 @@ uno::Reference< frame::XController > SAL_CALL ChartModel::getCurrentController() } void SAL_CALL ChartModel::setCurrentController( const uno::Reference< frame::XController >& xController ) - throw(container::NoSuchElementException, uno::RuntimeException, std::exception) { LifeTimeGuard aGuard(m_aLifeTimeManager); if(!aGuard.startApiCall()) @@ -502,7 +493,7 @@ void SAL_CALL ChartModel::setCurrentController( const uno::Reference< frame::XCo DisposeHelper::DisposeAndClear( m_xRangeHighlighter ); } -uno::Reference< uno::XInterface > SAL_CALL ChartModel::getCurrentSelection() throw(uno::RuntimeException, std::exception) +uno::Reference< uno::XInterface > SAL_CALL ChartModel::getCurrentSelection() { LifeTimeGuard aGuard(m_aLifeTimeManager); if(!aGuard.startApiCall()) @@ -529,7 +520,7 @@ uno::Reference< uno::XInterface > SAL_CALL ChartModel::getCurrentSelection() thr } // lang::XComponent (base of XModel) -void SAL_CALL ChartModel::dispose() throw(uno::RuntimeException, std::exception) +void SAL_CALL ChartModel::dispose() { Reference< XInterface > xKeepAlive( *this ); @@ -579,7 +570,6 @@ void SAL_CALL ChartModel::dispose() throw(uno::RuntimeException, std::exception) } void SAL_CALL ChartModel::addEventListener( const uno::Reference< lang::XEventListener > & xListener ) - throw(uno::RuntimeException, std::exception) { if( m_aLifeTimeManager.impl_isDisposedOrClosed() ) return; //behave passive if already disposed or closed @@ -588,7 +578,6 @@ void SAL_CALL ChartModel::addEventListener( const uno::Reference< lang::XEventLi } void SAL_CALL ChartModel::removeEventListener( const uno::Reference< lang::XEventListener > & xListener ) - throw(uno::RuntimeException, std::exception) { if( m_aLifeTimeManager.impl_isDisposedOrClosed(false) ) return; //behave passive if already disposed or closed @@ -599,13 +588,11 @@ void SAL_CALL ChartModel::removeEventListener( const uno::Reference< lang::XEven // util::XCloseBroadcaster (base of XCloseable) void SAL_CALL ChartModel::addCloseListener( const uno::Reference< util::XCloseListener > & xListener ) - throw(uno::RuntimeException, std::exception) { m_aLifeTimeManager.g_addCloseListener( xListener ); } void SAL_CALL ChartModel::removeCloseListener( const uno::Reference< util::XCloseListener > & xListener ) - throw(uno::RuntimeException, std::exception) { if( m_aLifeTimeManager.impl_isDisposedOrClosed(false) ) return; //behave passive if already disposed or closed @@ -616,8 +603,6 @@ void SAL_CALL ChartModel::removeCloseListener( const uno::Reference< util::XClos // util::XCloseable void SAL_CALL ChartModel::close( sal_Bool bDeliverOwnership ) - throw( util::CloseVetoException, - uno::RuntimeException, std::exception ) { //hold no mutex @@ -670,7 +655,6 @@ void SAL_CALL ChartModel::close( sal_Bool bDeliverOwnership ) // lang::XTypeProvider uno::Sequence< uno::Type > SAL_CALL ChartModel::getTypes() - throw (uno::RuntimeException, std::exception) { uno::Reference< lang::XTypeProvider > xAggTypeProvider; if( (m_xOldModelAgg->queryAggregation( cppu::UnoType::get()) >>= xAggTypeProvider) @@ -692,7 +676,7 @@ uno::Sequence< uno::Type > SAL_CALL ChartModel::getTypes() // document::XDocumentPropertiesSupplier uno::Reference< document::XDocumentProperties > SAL_CALL - ChartModel::getDocumentProperties() throw (uno::RuntimeException, std::exception) + ChartModel::getDocumentProperties() { ::osl::MutexGuard aGuard( m_aModelMutex ); if ( !m_xDocumentProperties.is() ) @@ -703,7 +687,7 @@ uno::Reference< document::XDocumentProperties > SAL_CALL } // document::XDocumentPropertiesSupplier -Reference< document::XUndoManager > SAL_CALL ChartModel::getUndoManager( ) throw (RuntimeException, std::exception) +Reference< document::XUndoManager > SAL_CALL ChartModel::getUndoManager( ) { ::osl::MutexGuard aGuard( m_aModelMutex ); if ( !m_pUndoManager.is() ) @@ -714,14 +698,12 @@ Reference< document::XUndoManager > SAL_CALL ChartModel::getUndoManager( ) thro // chart2::XChartDocument uno::Reference< chart2::XDiagram > SAL_CALL ChartModel::getFirstDiagram() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( m_aModelMutex ); return m_xDiagram; } void SAL_CALL ChartModel::setFirstDiagram( const uno::Reference< chart2::XDiagram >& xDiagram ) - throw (uno::RuntimeException, std::exception) { Reference< chart2::XDiagram > xOldDiagram; Reference< util::XModifyListener > xListener; @@ -781,7 +763,6 @@ Reference< chart2::data::XDataSource > ChartModel::impl_createDefaultData() } void SAL_CALL ChartModel::createInternalDataProvider( sal_Bool bCloneExistingData ) - throw (util::CloseVetoException, uno::RuntimeException, std::exception) { // don't lock the mutex, because this call calls out to code that tries to // lock the solar mutex. On the other hand, a paint locks the solar mutex @@ -799,13 +780,11 @@ void SAL_CALL ChartModel::createInternalDataProvider( sal_Bool bCloneExistingDat } sal_Bool SAL_CALL ChartModel::hasInternalDataProvider() - throw (uno::RuntimeException, std::exception) { return m_xDataProvider.is() && m_xInternalDataProvider.is(); } uno::Reference< chart2::data::XDataProvider > SAL_CALL ChartModel::getDataProvider() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( m_aModelMutex ); return m_xDataProvider; @@ -814,7 +793,6 @@ uno::Reference< chart2::data::XDataProvider > SAL_CALL ChartModel::getDataProvid // ____ XDataReceiver ____ void SAL_CALL ChartModel::attachDataProvider( const uno::Reference< chart2::data::XDataProvider >& xDataProvider ) - throw (uno::RuntimeException, std::exception) { { MutexGuard aGuard( m_aModelMutex ); @@ -840,7 +818,6 @@ void SAL_CALL ChartModel::attachDataProvider( const uno::Reference< chart2::data } void SAL_CALL ChartModel::attachNumberFormatsSupplier( const uno::Reference< util::XNumberFormatsSupplier >& xNewSupplier ) - throw (uno::RuntimeException, std::exception) { { MutexGuard aGuard( m_aModelMutex ); @@ -870,8 +847,6 @@ void SAL_CALL ChartModel::attachNumberFormatsSupplier( const uno::Reference< uti } void SAL_CALL ChartModel::setArguments( const Sequence< beans::PropertyValue >& aArguments ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { { MutexGuard aGuard( m_aModelMutex ); @@ -909,19 +884,16 @@ void SAL_CALL ChartModel::setArguments( const Sequence< beans::PropertyValue >& } Sequence< OUString > SAL_CALL ChartModel::getUsedRangeRepresentations() - throw (uno::RuntimeException, std::exception) { return DataSourceHelper::getUsedDataRanges( Reference< frame::XModel >(this)); } Reference< chart2::data::XDataSource > SAL_CALL ChartModel::getUsedData() - throw (uno::RuntimeException, std::exception) { return DataSourceHelper::getUsedData( Reference< chart2::XChartDocument >(this)); } Reference< chart2::data::XRangeHighlighter > SAL_CALL ChartModel::getRangeHighlighter() - throw (uno::RuntimeException, std::exception) { if( ! m_xRangeHighlighter.is()) { @@ -942,7 +914,6 @@ Reference< chart2::XChartTypeTemplate > ChartModel::impl_createDefaultChartTypeT } void SAL_CALL ChartModel::setChartTypeManager( const uno::Reference< chart2::XChartTypeManager >& xNewManager ) - throw (uno::RuntimeException, std::exception) { { MutexGuard aGuard( m_aModelMutex ); @@ -952,41 +923,35 @@ void SAL_CALL ChartModel::setChartTypeManager( const uno::Reference< chart2::XCh } uno::Reference< chart2::XChartTypeManager > SAL_CALL ChartModel::getChartTypeManager() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( m_aModelMutex ); return m_xChartTypeManager; } uno::Reference< beans::XPropertySet > SAL_CALL ChartModel::getPageBackground() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( m_aModelMutex ); return m_xPageBackground; } void SAL_CALL ChartModel::createDefaultChart() - throw (css::uno::RuntimeException, std::exception) { insertDefaultChart(); } sal_Bool SAL_CALL ChartModel::isOpenGLChart() - throw (css::uno::RuntimeException, std::exception) { return ChartHelper::isGL3DDiagram(m_xDiagram); } // ____ XTitled ____ uno::Reference< chart2::XTitle > SAL_CALL ChartModel::getTitleObject() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( m_aModelMutex ); return m_xTitle; } void SAL_CALL ChartModel::setTitleObject( const uno::Reference< chart2::XTitle >& xTitle ) - throw (uno::RuntimeException, std::exception) { { MutexGuard aGuard( m_aModelMutex ); @@ -1000,7 +965,6 @@ void SAL_CALL ChartModel::setTitleObject( const uno::Reference< chart2::XTitle > // ____ XInterface (for old API wrapper) ____ uno::Any SAL_CALL ChartModel::queryInterface( const uno::Type& aType ) - throw (uno::RuntimeException, std::exception) { uno::Any aResult( impl::ChartModel_Base::queryInterface( aType )); @@ -1023,17 +987,12 @@ uno::Any SAL_CALL ChartModel::queryInterface( const uno::Type& aType ) // ____ XCloneable ____ Reference< util::XCloneable > SAL_CALL ChartModel::createClone() - throw (uno::RuntimeException, std::exception) { return Reference< util::XCloneable >( new ChartModel( *this )); } // ____ XVisualObject ____ void SAL_CALL ChartModel::setVisualAreaSize( ::sal_Int64 nAspect, const awt::Size& aSize ) - throw (lang::IllegalArgumentException, - embed::WrongStateException, - uno::Exception, - uno::RuntimeException, std::exception) { if( nAspect == embed::Aspects::MSOLE_CONTENT ) { @@ -1059,10 +1018,6 @@ void SAL_CALL ChartModel::setVisualAreaSize( ::sal_Int64 nAspect, const awt::Siz } awt::Size SAL_CALL ChartModel::getVisualAreaSize( ::sal_Int64 nAspect ) - throw (lang::IllegalArgumentException, - embed::WrongStateException, - uno::Exception, - uno::RuntimeException, std::exception) { OSL_ENSURE( nAspect == embed::Aspects::MSOLE_CONTENT, "No aspects other than content are supported" ); @@ -1073,10 +1028,6 @@ awt::Size SAL_CALL ChartModel::getVisualAreaSize( ::sal_Int64 nAspect ) } embed::VisualRepresentation SAL_CALL ChartModel::getPreferredVisualRepresentation( ::sal_Int64 nAspect ) - throw (lang::IllegalArgumentException, - embed::WrongStateException, - uno::Exception, - uno::RuntimeException, std::exception) { OSL_ENSURE( nAspect == embed::Aspects::MSOLE_CONTENT, "No aspects other than content are supported" ); @@ -1115,8 +1066,6 @@ embed::VisualRepresentation SAL_CALL ChartModel::getPreferredVisualRepresentatio } ::sal_Int32 SAL_CALL ChartModel::getMapUnit( ::sal_Int64 nAspect ) - throw (uno::Exception, - uno::RuntimeException, std::exception) { OSL_ENSURE( nAspect == embed::Aspects::MSOLE_CONTENT, "No aspects other than content are supported" ); @@ -1126,9 +1075,6 @@ embed::VisualRepresentation SAL_CALL ChartModel::getPreferredVisualRepresentatio // ____ datatransfer::XTransferable ____ uno::Any SAL_CALL ChartModel::getTransferData( const datatransfer::DataFlavor& aFlavor ) - throw (datatransfer::UnsupportedFlavorException, - io::IOException, - uno::RuntimeException, std::exception) { uno::Any aResult; if( this->isDataFlavorSupported( aFlavor )) @@ -1159,7 +1105,6 @@ uno::Any SAL_CALL ChartModel::getTransferData( const datatransfer::DataFlavor& a } Sequence< datatransfer::DataFlavor > SAL_CALL ChartModel::getTransferDataFlavors() - throw (uno::RuntimeException, std::exception) { uno::Sequence< datatransfer::DataFlavor > aRet(1); @@ -1171,7 +1116,6 @@ Sequence< datatransfer::DataFlavor > SAL_CALL ChartModel::getTransferDataFlavors } sal_Bool SAL_CALL ChartModel::isDataFlavorSupported( const datatransfer::DataFlavor& aFlavor ) - throw (uno::RuntimeException, std::exception) { return aFlavor.MimeType.equals(lcl_aGDIMetaFileMIMETypeHighContrast); } @@ -1206,7 +1150,6 @@ tServiceNameMap & lcl_getStaticServiceNameMap() } // ____ XMultiServiceFactory ____ Reference< uno::XInterface > SAL_CALL ChartModel::createInstance( const OUString& rServiceSpecifier ) - throw( uno::Exception, uno::RuntimeException, std::exception ) { uno::Reference< uno::XInterface > xResult; tServiceNameMap & rMap = lcl_getStaticServiceNameMap(); @@ -1260,7 +1203,6 @@ Reference< uno::XInterface > SAL_CALL ChartModel::createInstance( const OUString Reference< uno::XInterface > SAL_CALL ChartModel::createInstanceWithArguments( const OUString& rServiceSpecifier , const Sequence< Any >& Arguments ) - throw( uno::Exception, uno::RuntimeException, std::exception ) { OSL_ENSURE( Arguments.getLength(), "createInstanceWithArguments: Warning: Arguments are ignored" ); (void)(Arguments); // avoid warning in non-debug builds @@ -1268,7 +1210,6 @@ Reference< uno::XInterface > SAL_CALL ChartModel::createInstanceWithArguments( } Sequence< OUString > SAL_CALL ChartModel::getAvailableServiceNames() - throw( uno::RuntimeException, std::exception ) { uno::Sequence< OUString > aResult; @@ -1301,7 +1242,6 @@ Reference< util::XNumberFormatsSupplier > const & ChartModel::getNumberFormatsSu // ____ XUnoTunnel ___ ::sal_Int64 SAL_CALL ChartModel::getSomething( const Sequence< ::sal_Int8 >& aIdentifier ) - throw( uno::RuntimeException, std::exception) { if( aIdentifier.getLength() == 16 && 0 == memcmp( SvNumberFormatsSupplierObj::getUnoTunnelId().getConstArray(), aIdentifier.getConstArray(), 16 ) ) @@ -1315,7 +1255,6 @@ Reference< util::XNumberFormatsSupplier > const & ChartModel::getNumberFormatsSu // ____ XNumberFormatsSupplier ____ uno::Reference< beans::XPropertySet > SAL_CALL ChartModel::getNumberFormatSettings() - throw (uno::RuntimeException, std::exception) { Reference< util::XNumberFormatsSupplier > xSupplier( getNumberFormatsSupplier() ); if( xSupplier.is() ) @@ -1324,7 +1263,6 @@ uno::Reference< beans::XPropertySet > SAL_CALL ChartModel::getNumberFormatSettin } uno::Reference< util::XNumberFormats > SAL_CALL ChartModel::getNumberFormats() - throw (uno::RuntimeException, std::exception) { Reference< util::XNumberFormatsSupplier > xSupplier( getNumberFormatsSupplier() ); if( xSupplier.is() ) @@ -1334,14 +1272,11 @@ uno::Reference< util::XNumberFormats > SAL_CALL ChartModel::getNumberFormats() // ____ XChild ____ Reference< uno::XInterface > SAL_CALL ChartModel::getParent() - throw (uno::RuntimeException, std::exception) { return Reference< uno::XInterface >(m_xParent,uno::UNO_QUERY); } void SAL_CALL ChartModel::setParent( const Reference< uno::XInterface >& Parent ) - throw (lang::NoSupportException, - uno::RuntimeException, std::exception) { if( Parent != m_xParent ) m_xParent.set( Parent, uno::UNO_QUERY ); @@ -1349,7 +1284,6 @@ void SAL_CALL ChartModel::setParent( const Reference< uno::XInterface >& Parent // ____ XDataSource ____ uno::Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL ChartModel::getDataSequences() - throw (uno::RuntimeException, std::exception) { Reference< chart2::data::XDataSource > xSource( DataSourceHelper::getUsedData( uno::Reference< frame::XModel >(this) ) ); @@ -1361,7 +1295,6 @@ uno::Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL ChartM //XDumper OUString SAL_CALL ChartModel::dump() - throw (uno::RuntimeException, std::exception) { uno::Reference< qa::XDumper > xDumper( this->createInstance( CHART_VIEW_SERVICE_NAME ), uno::UNO_QUERY ); @@ -1416,14 +1349,12 @@ void ChartModel::setTimeBasedRange(sal_Int32 nStart, sal_Int32 nEnd) } void ChartModel::setWindow( const sal_uInt64 nWindowPtr ) - throw (uno::RuntimeException, std::exception) { OpenGLWindow* pWindow = reinterpret_cast(nWindowPtr); mpOpenGLWindow = pWindow; } void ChartModel::update() - throw (uno::RuntimeException, std::exception) { if(!mxChartView.is()) { diff --git a/chart2/source/model/main/ChartModel_Persistence.cxx b/chart2/source/model/main/ChartModel_Persistence.cxx index b2eb99f87453..bba125948d3a 100644 --- a/chart2/source/model/main/ChartModel_Persistence.cxx +++ b/chart2/source/model/main/ChartModel_Persistence.cxx @@ -202,9 +202,6 @@ Reference< document::XFilter > ChartModel::impl_createFilter( // frame::XStorable2 void SAL_CALL ChartModel::storeSelf( const Sequence< beans::PropertyValue >& rMediaDescriptor ) - throw (lang::IllegalArgumentException, - io::IOException, - uno::RuntimeException, std::exception) { // only some parameters are allowed (see also SfxBaseModel) // "VersionComment", "Author", "InteractionHandler", "StatusIndicator" @@ -215,28 +212,23 @@ void SAL_CALL ChartModel::storeSelf( const Sequence< beans::PropertyValue >& rMe // frame::XStorable (base of XStorable2) sal_Bool SAL_CALL ChartModel::hasLocation() - throw(uno::RuntimeException, std::exception) { //@todo guard return !m_aResource.isEmpty(); } OUString SAL_CALL ChartModel::getLocation() - throw(uno::RuntimeException, std::exception) { return impl_g_getLocation(); } sal_Bool SAL_CALL ChartModel::isReadonly() - throw(uno::RuntimeException, std::exception) { //@todo guard return m_bReadOnly; } void SAL_CALL ChartModel::store() - throw(io::IOException, - uno::RuntimeException, std::exception) { apphelper::LifeTimeGuard aGuard(m_aLifeTimeManager); if(!aGuard.startApiCall(true)) //start LongLastingCall @@ -259,7 +251,6 @@ void SAL_CALL ChartModel::store() void SAL_CALL ChartModel::storeAsURL( const OUString& rURL, const uno::Sequence< beans::PropertyValue >& rMediaDescriptor ) - throw(io::IOException, uno::RuntimeException, std::exception) { apphelper::LifeTimeGuard aGuard(m_aLifeTimeManager); if(!aGuard.startApiCall(true)) //start LongLastingCall @@ -285,8 +276,6 @@ void SAL_CALL ChartModel::storeAsURL( void SAL_CALL ChartModel::storeToURL( const OUString& rURL, const uno::Sequence< beans::PropertyValue >& rMediaDescriptor ) - throw(io::IOException, - uno::RuntimeException, std::exception) { apphelper::LifeTimeGuard aGuard(m_aLifeTimeManager); if(!aGuard.startApiCall(true)) //start LongLastingCall @@ -481,19 +470,11 @@ void ChartModel::insertDefaultChart() // frame::XLoadable void SAL_CALL ChartModel::initNew() - throw (frame::DoubleInitializationException, - io::IOException, - uno::Exception, - uno::RuntimeException, std::exception) { } void SAL_CALL ChartModel::load( const Sequence< beans::PropertyValue >& rMediaDescriptor ) - throw (frame::DoubleInitializationException, - io::IOException, - uno::Exception, - uno::RuntimeException, std::exception) { Reference< embed::XStorage > xStorage; OUString aURL; @@ -652,7 +633,6 @@ void ChartModel::impl_loadGraphics( // util::XModifiable void SAL_CALL ChartModel::impl_notifyModifiedListeners() - throw( uno::RuntimeException) { { MutexGuard aGuard( m_aModelMutex ); @@ -678,15 +658,12 @@ void SAL_CALL ChartModel::impl_notifyModifiedListeners() } sal_Bool SAL_CALL ChartModel::isModified() - throw(uno::RuntimeException, std::exception) { //@todo guard return m_bModified; } void SAL_CALL ChartModel::setModified( sal_Bool bModified ) - throw(beans::PropertyVetoException, - uno::RuntimeException, std::exception) { apphelper::LifeTimeGuard aGuard(m_aLifeTimeManager); if(!aGuard.startApiCall())//@todo ? is this a long lasting call?? @@ -707,7 +684,6 @@ void SAL_CALL ChartModel::setModified( sal_Bool bModified ) // util::XModifyBroadcaster (base of XModifiable) void SAL_CALL ChartModel::addModifyListener( const uno::Reference< util::XModifyListener >& xListener ) - throw(uno::RuntimeException, std::exception) { if( m_aLifeTimeManager.impl_isDisposedOrClosed() ) return; //behave passive if already disposed or closed @@ -718,7 +694,6 @@ void SAL_CALL ChartModel::addModifyListener( void SAL_CALL ChartModel::removeModifyListener( const uno::Reference< util::XModifyListener >& xListener ) - throw(uno::RuntimeException, std::exception) { if( m_aLifeTimeManager.impl_isDisposedOrClosed(false) ) return; //behave passive if already disposed or closed @@ -729,7 +704,6 @@ void SAL_CALL ChartModel::removeModifyListener( // util::XModifyListener void SAL_CALL ChartModel::modified( const lang::EventObject& ) - throw (uno::RuntimeException, std::exception) { if( m_nInLoad == 0 ) setModified( true ); @@ -737,7 +711,6 @@ void SAL_CALL ChartModel::modified( const lang::EventObject& ) // lang::XEventListener (base of util::XModifyListener) void SAL_CALL ChartModel::disposing( const lang::EventObject& ) - throw (uno::RuntimeException, std::exception) { // child was disposed -- should not happen from outside } @@ -746,11 +719,6 @@ void SAL_CALL ChartModel::disposing( const lang::EventObject& ) void SAL_CALL ChartModel::loadFromStorage( const Reference< embed::XStorage >& xStorage, const Sequence< beans::PropertyValue >& rMediaDescriptor ) - throw (lang::IllegalArgumentException, - frame::DoubleInitializationException, - io::IOException, - uno::Exception, - uno::RuntimeException, std::exception) { attachResource( OUString(), rMediaDescriptor ); impl_load( rMediaDescriptor, xStorage ); @@ -759,34 +727,22 @@ void SAL_CALL ChartModel::loadFromStorage( void SAL_CALL ChartModel::storeToStorage( const Reference< embed::XStorage >& xStorage, const Sequence< beans::PropertyValue >& rMediaDescriptor ) - throw (lang::IllegalArgumentException, - io::IOException, - uno::Exception, - uno::RuntimeException, std::exception) { impl_store( rMediaDescriptor, xStorage ); } void SAL_CALL ChartModel::switchToStorage( const Reference< embed::XStorage >& xStorage ) - throw (lang::IllegalArgumentException, - io::IOException, - uno::Exception, - uno::RuntimeException, std::exception) { m_xStorage = xStorage; impl_notifyStorageChangeListeners(); } Reference< embed::XStorage > SAL_CALL ChartModel::getDocumentStorage() - throw (io::IOException, - uno::Exception, - uno::RuntimeException, std::exception) { return m_xStorage; } void SAL_CALL ChartModel::impl_notifyStorageChangeListeners() - throw( uno::RuntimeException) { ::cppu::OInterfaceContainerHelper* pIC = m_aLifeTimeManager.m_aListenerContainer .getContainer( cppu::UnoType::get()); @@ -803,7 +759,6 @@ void SAL_CALL ChartModel::impl_notifyStorageChangeListeners() } void SAL_CALL ChartModel::addStorageChangeListener( const Reference< document::XStorageChangeListener >& xListener ) - throw (uno::RuntimeException, std::exception) { if( m_aLifeTimeManager.impl_isDisposedOrClosed() ) return; //behave passive if already disposed or closed @@ -813,7 +768,6 @@ void SAL_CALL ChartModel::addStorageChangeListener( const Reference< document::X } void SAL_CALL ChartModel::removeStorageChangeListener( const Reference< document::XStorageChangeListener >& xListener ) - throw (uno::RuntimeException, std::exception) { if( m_aLifeTimeManager.impl_isDisposedOrClosed(false) ) return; //behave passive if already disposed or closed diff --git a/chart2/source/model/main/DataPoint.cxx b/chart2/source/model/main/DataPoint.cxx index 0f359648f31f..ec5b6bc28d29 100644 --- a/chart2/source/model/main/DataPoint.cxx +++ b/chart2/source/model/main/DataPoint.cxx @@ -150,29 +150,24 @@ DataPoint::~DataPoint() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL DataPoint::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new DataPoint( *this )); } // ____ XChild ____ Reference< uno::XInterface > SAL_CALL DataPoint::getParent() - throw (uno::RuntimeException, std::exception) { return Reference< uno::XInterface >( m_xParentProperties.get(), uno::UNO_QUERY ); } void SAL_CALL DataPoint::setParent( const Reference< uno::XInterface >& Parent ) - throw (lang::NoSupportException, - uno::RuntimeException, std::exception) { m_xParentProperties = Reference< beans::XPropertySet >( Parent, uno::UNO_QUERY ); } // ____ OPropertySet ____ uno::Any DataPoint::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { // the value set at the data series is the default uno::Reference< beans::XFastPropertySet > xFast( m_xParentProperties.get(), uno::UNO_QUERY ); @@ -187,7 +182,6 @@ uno::Any DataPoint::GetDefaultValue( sal_Int32 nHandle ) const void SAL_CALL DataPoint::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const uno::Any& rValue ) - throw (uno::Exception, std::exception) { if( nHandle == DataPointProperties::PROP_DATAPOINT_ERROR_BAR_Y || nHandle == DataPointProperties::PROP_DATAPOINT_ERROR_BAR_X ) @@ -221,14 +215,12 @@ void SAL_CALL DataPoint::setFastPropertyValue_NoBroadcast( // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL DataPoint::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticDataPointInfo::get(); } // ____ XModifyBroadcaster ____ void SAL_CALL DataPoint::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -242,7 +234,6 @@ void SAL_CALL DataPoint::addModifyListener( const uno::Reference< util::XModifyL } void SAL_CALL DataPoint::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -257,14 +248,12 @@ void SAL_CALL DataPoint::removeModifyListener( const uno::Reference< util::XModi // ____ XModifyListener ____ void SAL_CALL DataPoint::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { m_xModifyEventForwarder->modified( aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL DataPoint::disposing( const lang::EventObject& ) - throw (uno::RuntimeException, std::exception) { // nothing } @@ -282,19 +271,16 @@ IMPLEMENT_FORWARD_XINTERFACE2( DataPoint, DataPoint_Base, ::property::OPropertyS // implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL DataPoint::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.DataPoint") ; } sal_Bool SAL_CALL DataPoint::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL DataPoint::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return Sequence< OUString >{ "com.sun.star.drawing.FillProperties", diff --git a/chart2/source/model/main/DataPoint.hxx b/chart2/source/model/main/DataPoint.hxx index 8335509b8f8f..187c6350aaa7 100644 --- a/chart2/source/model/main/DataPoint.hxx +++ b/chart2/source/model/main/DataPoint.hxx @@ -57,60 +57,46 @@ public: /// merge XInterface implementations DECLARE_XINTERFACE() /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; protected: explicit DataPoint( const DataPoint & rOther ); // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast ( sal_Int32 nHandle, - const css::uno::Any& rValue ) - throw (css::uno::Exception, std::exception) override; + const css::uno::Any& rValue ) override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XCloneable ____ // Note: m_xParentProperties are not cloned! - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; // ____ XChild ____ - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent() override; virtual void SAL_CALL setParent( - const css::uno::Reference< css::uno::XInterface >& Parent ) - throw (css::lang::NoSupportException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::uno::XInterface >& Parent ) override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // ____ XModifyListener ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; // ____ OPropertySet ____ virtual void firePropertyChangeEvent() override; diff --git a/chart2/source/model/main/DataSeries.cxx b/chart2/source/model/main/DataSeries.cxx index 7d88338a308a..440634a1978e 100644 --- a/chart2/source/model/main/DataSeries.cxx +++ b/chart2/source/model/main/DataSeries.cxx @@ -219,7 +219,6 @@ DataSeries::~DataSeries() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL DataSeries::createClone() - throw (uno::RuntimeException, std::exception) { DataSeries * pNewSeries( new DataSeries( *this )); // hold a reference to the clone @@ -232,8 +231,6 @@ uno::Reference< util::XCloneable > SAL_CALL DataSeries::createClone() // ____ OPropertySet ____ uno::Any DataSeries::GetDefaultValue( sal_Int32 nHandle ) const - throw (beans::UnknownPropertyException, - uno::RuntimeException) { const tPropertyValueMap& rStaticDefaults = StaticDataSeriesDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -250,7 +247,6 @@ uno::Any DataSeries::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL DataSeries::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return StaticDataSeriesInfo::get(); } @@ -272,7 +268,6 @@ void SAL_CALL DataSeries::getFastPropertyValue void SAL_CALL DataSeries::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const uno::Any& rValue ) - throw (uno::Exception, std::exception) { if( nHandle == DataPointProperties::PROP_DATAPOINT_ERROR_BAR_Y || nHandle == DataPointProperties::PROP_DATAPOINT_ERROR_BAR_X ) @@ -301,8 +296,6 @@ void SAL_CALL DataSeries::setFastPropertyValue_NoBroadcast( Reference< beans::XPropertySet > SAL_CALL DataSeries::getDataPointByIndex( sal_Int32 nIndex ) - throw (lang::IndexOutOfBoundsException, - uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xResult; @@ -351,7 +344,6 @@ Reference< beans::XPropertySet > } void SAL_CALL DataSeries::resetDataPoint( sal_Int32 nIndex ) - throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xDataPointProp; Reference< util::XModifyListener > xModifyEventForwarder; @@ -376,7 +368,6 @@ void SAL_CALL DataSeries::resetDataPoint( sal_Int32 nIndex ) } void SAL_CALL DataSeries::resetAllDataPoints() - throw (uno::RuntimeException, std::exception) { tDataPointAttributeContainer aOldAttributedDataPoints; Reference< util::XModifyListener > xModifyEventForwarder; @@ -392,7 +383,6 @@ void SAL_CALL DataSeries::resetAllDataPoints() // ____ XDataSink ____ void SAL_CALL DataSeries::setData( const uno::Sequence< Reference< chart2::data::XLabeledDataSequence > >& aData ) - throw (uno::RuntimeException, std::exception) { tDataSequenceContainer aOldDataSequences; tDataSequenceContainer aNewDataSequences; @@ -415,7 +405,6 @@ void SAL_CALL DataSeries::setData( const uno::Sequence< Reference< chart2::data: // ____ XDataSource ____ Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL DataSeries::getDataSequences() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); return comphelper::containerToSequence( m_aDataSequences ); @@ -424,8 +413,6 @@ Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL DataSeries: // ____ XRegressionCurveContainer ____ void SAL_CALL DataSeries::addRegressionCurve( const uno::Reference< chart2::XRegressionCurve >& xRegressionCurve ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { Reference< util::XModifyListener > xModifyEventForwarder; { @@ -442,8 +429,6 @@ void SAL_CALL DataSeries::addRegressionCurve( void SAL_CALL DataSeries::removeRegressionCurve( const uno::Reference< chart2::XRegressionCurve >& xRegressionCurve ) - throw (container::NoSuchElementException, - uno::RuntimeException, std::exception) { if( !xRegressionCurve.is() ) throw container::NoSuchElementException(); @@ -466,7 +451,6 @@ void SAL_CALL DataSeries::removeRegressionCurve( } uno::Sequence< uno::Reference< chart2::XRegressionCurve > > SAL_CALL DataSeries::getRegressionCurves() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); return comphelper::containerToSequence( m_aRegressionCurves ); @@ -474,7 +458,6 @@ uno::Sequence< uno::Reference< chart2::XRegressionCurve > > SAL_CALL DataSeries: void SAL_CALL DataSeries::setRegressionCurves( const Sequence< Reference< chart2::XRegressionCurve > >& aRegressionCurves ) - throw (uno::RuntimeException, std::exception) { tRegressionCurveContainerType aOldCurves; tRegressionCurveContainerType aNewCurves( ContainerHelper::SequenceToVector( aRegressionCurves ) ); @@ -492,7 +475,6 @@ void SAL_CALL DataSeries::setRegressionCurves( // ____ XModifyBroadcaster ____ void SAL_CALL DataSeries::addModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -506,7 +488,6 @@ void SAL_CALL DataSeries::addModifyListener( const Reference< util::XModifyListe } void SAL_CALL DataSeries::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -521,14 +502,12 @@ void SAL_CALL DataSeries::removeModifyListener( const Reference< util::XModifyLi // ____ XModifyListener ____ void SAL_CALL DataSeries::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { m_xModifyEventForwarder->modified( aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL DataSeries::disposing( const lang::EventObject& rEventObject ) - throw (uno::RuntimeException, std::exception) { // forget disposed data sequences tDataSequenceContainer::iterator aIt( @@ -556,19 +535,16 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( DataSeries, DataSeries_Base, OPropertySet ) // implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL DataSeries::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.DataSeries"); } sal_Bool SAL_CALL DataSeries::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL DataSeries::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart2.DataSeries", diff --git a/chart2/source/model/main/Diagram.cxx b/chart2/source/model/main/Diagram.cxx index f8323f06df61..47508e5d05f5 100644 --- a/chart2/source/model/main/Diagram.cxx +++ b/chart2/source/model/main/Diagram.cxx @@ -362,7 +362,6 @@ Diagram::~Diagram() // ____ XDiagram ____ uno::Reference< beans::XPropertySet > SAL_CALL Diagram::getWall() - throw (uno::RuntimeException, std::exception) { uno::Reference< beans::XPropertySet > xRet; bool bAddListener = false; @@ -381,7 +380,6 @@ uno::Reference< beans::XPropertySet > SAL_CALL Diagram::getWall() } uno::Reference< beans::XPropertySet > SAL_CALL Diagram::getFloor() - throw (uno::RuntimeException, std::exception) { uno::Reference< beans::XPropertySet > xRet; bool bAddListener = false; @@ -400,14 +398,12 @@ uno::Reference< beans::XPropertySet > SAL_CALL Diagram::getFloor() } uno::Reference< chart2::XLegend > SAL_CALL Diagram::getLegend() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); return m_xLegend; } void SAL_CALL Diagram::setLegend( const uno::Reference< chart2::XLegend >& xNewLegend ) - throw (uno::RuntimeException, std::exception) { Reference< chart2::XLegend > xOldLegend; { @@ -425,7 +421,6 @@ void SAL_CALL Diagram::setLegend( const uno::Reference< chart2::XLegend >& xNewL } Reference< chart2::XColorScheme > SAL_CALL Diagram::getDefaultColorScheme() - throw (uno::RuntimeException, std::exception) { Reference< chart2::XColorScheme > xRet; { @@ -443,7 +438,6 @@ Reference< chart2::XColorScheme > SAL_CALL Diagram::getDefaultColorScheme() } void SAL_CALL Diagram::setDefaultColorScheme( const Reference< chart2::XColorScheme >& xColorScheme ) - throw (uno::RuntimeException, std::exception) { { MutexGuard aGuard( GetMutex() ); @@ -455,7 +449,6 @@ void SAL_CALL Diagram::setDefaultColorScheme( const Reference< chart2::XColorSch void SAL_CALL Diagram::setDiagramData( const Reference< chart2::data::XDataSource >& xDataSource, const Sequence< beans::PropertyValue >& aArguments ) - throw (uno::RuntimeException, std::exception) { uno::Reference< lang::XMultiServiceFactory > xChartTypeManager( m_xContext->getServiceManager()->createInstanceWithContext( "com.sun.star.chart2.ChartTypeManager", m_xContext ), uno::UNO_QUERY ); @@ -470,14 +463,12 @@ void SAL_CALL Diagram::setDiagramData( // ____ XTitled ____ uno::Reference< chart2::XTitle > SAL_CALL Diagram::getTitleObject() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); return m_xTitle; } void SAL_CALL Diagram::setTitleObject( const uno::Reference< chart2::XTitle >& xNewTitle ) - throw (uno::RuntimeException, std::exception) { Reference< chart2::XTitle > xOldTitle; { @@ -496,19 +487,16 @@ void SAL_CALL Diagram::setTitleObject( const uno::Reference< chart2::XTitle >& x // ____ X3DDefaultSetter ____ void SAL_CALL Diagram::set3DSettingsToDefault() - throw (uno::RuntimeException, std::exception) { ThreeDHelper::set3DSettingsToDefault( this ); } void SAL_CALL Diagram::setDefaultRotation() - throw (uno::RuntimeException, std::exception) { ThreeDHelper::setDefaultRotation( this ); } void SAL_CALL Diagram::setDefaultIllumination() - throw (uno::RuntimeException, std::exception) { ThreeDHelper::setDefaultIllumination( this ); } @@ -516,8 +504,6 @@ void SAL_CALL Diagram::setDefaultIllumination() // ____ XCoordinateSystemContainer ____ void SAL_CALL Diagram::addCoordinateSystem( const uno::Reference< chart2::XCoordinateSystem >& aCoordSys ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { { MutexGuard aGuard( GetMutex() ); @@ -538,8 +524,6 @@ void SAL_CALL Diagram::addCoordinateSystem( void SAL_CALL Diagram::removeCoordinateSystem( const uno::Reference< chart2::XCoordinateSystem >& aCoordSys ) - throw (container::NoSuchElementException, - uno::RuntimeException, std::exception) { { MutexGuard aGuard( GetMutex() ); @@ -556,7 +540,6 @@ void SAL_CALL Diagram::removeCoordinateSystem( } uno::Sequence< uno::Reference< chart2::XCoordinateSystem > > SAL_CALL Diagram::getCoordinateSystems() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); return comphelper::containerToSequence( m_aCoordSystems ); @@ -564,8 +547,6 @@ uno::Sequence< uno::Reference< chart2::XCoordinateSystem > > SAL_CALL Diagram::g void SAL_CALL Diagram::setCoordinateSystems( const Sequence< Reference< chart2::XCoordinateSystem > >& aCoordinateSystems ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { tCoordinateSystemContainerType aNew; tCoordinateSystemContainerType aOld; @@ -586,7 +567,6 @@ void SAL_CALL Diagram::setCoordinateSystems( // ____ XCloneable ____ Reference< util::XCloneable > SAL_CALL Diagram::createClone() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); return Reference< util::XCloneable >( new Diagram( *this )); @@ -594,7 +574,6 @@ Reference< util::XCloneable > SAL_CALL Diagram::createClone() // ____ XModifyBroadcaster ____ void SAL_CALL Diagram::addModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -608,7 +587,6 @@ void SAL_CALL Diagram::addModifyListener( const Reference< util::XModifyListener } void SAL_CALL Diagram::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -623,14 +601,12 @@ void SAL_CALL Diagram::removeModifyListener( const Reference< util::XModifyListe // ____ XModifyListener ____ void SAL_CALL Diagram::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { m_xModifyEventForwarder->modified( aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL Diagram::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException, std::exception) { // nothing } @@ -648,7 +624,6 @@ void Diagram::fireModifyEvent() // ____ OPropertySet ____ uno::Any Diagram::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticDiagramDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -665,17 +640,12 @@ uno::Any Diagram::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL Diagram::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticDiagramInfo::get(); } // ____ XFastPropertySet ____ void SAL_CALL Diagram::setFastPropertyValue( sal_Int32 nHandle, const Any& rValue ) - throw(beans::UnknownPropertyException, - beans::PropertyVetoException, - lang::IllegalArgumentException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { //special treatment for some 3D properties if( PROP_DIAGRAM_PERSPECTIVE == nHandle ) @@ -735,19 +705,16 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( Diagram, Diagram_Base, ::property::OPropertySe // implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL Diagram::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart2.Diagram"); } sal_Bool SAL_CALL Diagram::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL Diagram::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart2.Diagram", diff --git a/chart2/source/model/main/FormattedString.cxx b/chart2/source/model/main/FormattedString.cxx index 4396a584b71a..bc0224d88b2e 100644 --- a/chart2/source/model/main/FormattedString.cxx +++ b/chart2/source/model/main/FormattedString.cxx @@ -113,21 +113,18 @@ FormattedString::~FormattedString() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL FormattedString::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new FormattedString( *this )); } // ____ XFormattedString ____ OUString SAL_CALL FormattedString::getString() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex()); return m_aString; } void SAL_CALL FormattedString::setString( const OUString& String ) - throw (uno::RuntimeException, std::exception) { { MutexGuard aGuard( GetMutex()); @@ -140,7 +137,6 @@ void SAL_CALL FormattedString::setString( const OUString& String ) // ____ XModifyBroadcaster ____ void SAL_CALL FormattedString::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -154,7 +150,6 @@ void SAL_CALL FormattedString::addModifyListener( const uno::Reference< util::XM } void SAL_CALL FormattedString::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -169,14 +164,12 @@ void SAL_CALL FormattedString::removeModifyListener( const uno::Reference< util: // ____ XModifyListener ____ void SAL_CALL FormattedString::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { m_xModifyEventForwarder->modified( aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL FormattedString::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException, std::exception) { // nothing } @@ -194,7 +187,6 @@ void FormattedString::fireModifyEvent() // ____ OPropertySet ____ uno::Any FormattedString::GetDefaultValue( sal_Int32 nHandle ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) { const tPropertyValueMap& rStaticDefaults = *StaticFormattedStringDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -211,7 +203,6 @@ uno::Any FormattedString::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL FormattedString::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticFormattedStringInfo::get(); } @@ -225,19 +216,16 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( FormattedString, FormattedString_Base, ::prope // implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL FormattedString::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.FormattedString"); } sal_Bool SAL_CALL FormattedString::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL FormattedString::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart2.FormattedString", diff --git a/chart2/source/model/main/FormattedString.hxx b/chart2/source/model/main/FormattedString.hxx index 2eb5565bd64b..2a1ea0cf9cc2 100644 --- a/chart2/source/model/main/FormattedString.hxx +++ b/chart2/source/model/main/FormattedString.hxx @@ -54,74 +54,61 @@ public: virtual ~FormattedString() override; /// declare XServiceInfo methods - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; /// merge XInterface implementations DECLARE_XINTERFACE() /// merge XTypeProvider implementations DECLARE_XTYPEPROVIDER() - virtual void SAL_CALL setPropertyValue(const OUString& p1, const css::uno::Any& p2) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL setPropertyValue(const OUString& p1, const css::uno::Any& p2) override { ::property::OPropertySet::setPropertyValue(p1, p2); } - virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& p1) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + virtual css::uno::Any SAL_CALL getPropertyValue(const OUString& p1) override { return ::property::OPropertySet::getPropertyValue(p1); } - virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const css::uno::Reference& p2) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL addPropertyChangeListener(const OUString& p1, const css::uno::Reference& p2) override { ::property::OPropertySet::addPropertyChangeListener(p1, p2); } - virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const css::uno::Reference& p2) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removePropertyChangeListener(const OUString& p1, const css::uno::Reference& p2) override { ::property::OPropertySet::removePropertyChangeListener(p1, p2); } - virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const css::uno::Reference& p2) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL addVetoableChangeListener(const OUString& p1, const css::uno::Reference& p2) override { ::property::OPropertySet::addVetoableChangeListener(p1, p2); } - virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference& p2) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removeVetoableChangeListener(const OUString& p1, const css::uno::Reference& p2) override { ::property::OPropertySet::removeVetoableChangeListener(p1, p2); } protected: explicit FormattedString( const FormattedString & rOther ); // ____ XFormattedString ____ - virtual OUString SAL_CALL getString() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setString( const OUString& String ) - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getString() override; + virtual void SAL_CALL setString( const OUString& String ) override; // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; // ____ OPropertySet ____ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // ____ XModifyListener ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; // ____ OPropertySet ____ virtual void firePropertyChangeEvent() override; diff --git a/chart2/source/model/main/GridProperties.cxx b/chart2/source/model/main/GridProperties.cxx index 6c6dee23a355..4014cbd1dda6 100644 --- a/chart2/source/model/main/GridProperties.cxx +++ b/chart2/source/model/main/GridProperties.cxx @@ -149,7 +149,6 @@ GridProperties::~GridProperties() // ____ OPropertySet ____ uno::Any GridProperties::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticGridDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -165,21 +164,18 @@ uno::Any GridProperties::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL GridProperties::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticGridInfo::get(); } // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL GridProperties::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new GridProperties( *this )); } // ____ XModifyBroadcaster ____ void SAL_CALL GridProperties::addModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -193,7 +189,6 @@ void SAL_CALL GridProperties::addModifyListener( const Reference< util::XModifyL } void SAL_CALL GridProperties::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -208,14 +203,12 @@ void SAL_CALL GridProperties::removeModifyListener( const Reference< util::XModi // ____ XModifyListener ____ void SAL_CALL GridProperties::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { m_xModifyEventForwarder->modified( aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL GridProperties::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException, std::exception) { // nothing } @@ -228,19 +221,16 @@ void GridProperties::firePropertyChangeEvent() // implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL GridProperties::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart2.GridProperties"); } sal_Bool SAL_CALL GridProperties::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL GridProperties::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart2.GridProperties", diff --git a/chart2/source/model/main/GridProperties.hxx b/chart2/source/model/main/GridProperties.hxx index a38481edaf06..798ae0e8a3b7 100644 --- a/chart2/source/model/main/GridProperties.hxx +++ b/chart2/source/model/main/GridProperties.hxx @@ -56,12 +56,9 @@ public: virtual ~GridProperties() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; /// merge XInterface implementations DECLARE_XINTERFACE() @@ -72,37 +69,30 @@ protected: explicit GridProperties( const GridProperties & rOther ); // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // ____ XModifyListener ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; // ____ OPropertySet ____ virtual void firePropertyChangeEvent() override; diff --git a/chart2/source/model/main/Legend.cxx b/chart2/source/model/main/Legend.cxx index 3df5156c86b0..a3a80d642875 100644 --- a/chart2/source/model/main/Legend.cxx +++ b/chart2/source/model/main/Legend.cxx @@ -201,14 +201,12 @@ Legend::~Legend() // ____ XCloneable ____ Reference< util::XCloneable > SAL_CALL Legend::createClone() - throw (uno::RuntimeException, std::exception) { return Reference< util::XCloneable >( new Legend( *this )); } // ____ XModifyBroadcaster ____ void SAL_CALL Legend::addModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -222,7 +220,6 @@ void SAL_CALL Legend::addModifyListener( const Reference< util::XModifyListener } void SAL_CALL Legend::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -237,14 +234,12 @@ void SAL_CALL Legend::removeModifyListener( const Reference< util::XModifyListen // ____ XModifyListener ____ void SAL_CALL Legend::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { m_xModifyEventForwarder->modified( aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL Legend::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException, std::exception) { // nothing } @@ -257,7 +252,6 @@ void Legend::firePropertyChangeEvent() // ____ OPropertySet ____ Any Legend::GetDefaultValue( sal_Int32 nHandle ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) { const tPropertyValueMap& rStaticDefaults = *StaticLegendDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -273,26 +267,22 @@ Any Legend::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL Legend::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticLegendInfo::get(); } // implement XServiceInfo methods basing upon getSupportedServiceNames_Static OUString SAL_CALL Legend::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart2.Legend"); } sal_Bool SAL_CALL Legend::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL Legend::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart2.Legend", diff --git a/chart2/source/model/main/Legend.hxx b/chart2/source/model/main/Legend.hxx index 8b1a270f1412..044657195d00 100644 --- a/chart2/source/model/main/Legend.hxx +++ b/chart2/source/model/main/Legend.hxx @@ -55,12 +55,9 @@ public: virtual ~Legend() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; /// merge XInterface implementations DECLARE_XINTERFACE() @@ -71,38 +68,31 @@ protected: explicit Legend( const Legend & rOther ); // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; // ____ OPropertySet ____ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // ____ XModifyListener ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; // ____ OPropertySet ____ virtual void firePropertyChangeEvent() override; diff --git a/chart2/source/model/main/PageBackground.cxx b/chart2/source/model/main/PageBackground.cxx index 0252c8c431ba..52308600f912 100644 --- a/chart2/source/model/main/PageBackground.cxx +++ b/chart2/source/model/main/PageBackground.cxx @@ -127,14 +127,12 @@ PageBackground::~PageBackground() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL PageBackground::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new PageBackground( *this )); } // ____ OPropertySet ____ uno::Any PageBackground::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticPageBackgroundDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -150,14 +148,12 @@ uno::Any PageBackground::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL PageBackground::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticPageBackgroundInfo::get(); } // ____ XModifyBroadcaster ____ void SAL_CALL PageBackground::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -171,7 +167,6 @@ void SAL_CALL PageBackground::addModifyListener( const uno::Reference< util::XMo } void SAL_CALL PageBackground::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -186,14 +181,12 @@ void SAL_CALL PageBackground::removeModifyListener( const uno::Reference< util:: // ____ XModifyListener ____ void SAL_CALL PageBackground::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { m_xModifyEventForwarder->modified( aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL PageBackground::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException, std::exception) { // nothing } @@ -205,19 +198,16 @@ void PageBackground::firePropertyChangeEvent() } OUString SAL_CALL PageBackground::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart2.PageBackground"); } sal_Bool SAL_CALL PageBackground::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL PageBackground::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart2.PageBackground", diff --git a/chart2/source/model/main/PageBackground.hxx b/chart2/source/model/main/PageBackground.hxx index 280ff9b9cde6..f83fd16c75d9 100644 --- a/chart2/source/model/main/PageBackground.hxx +++ b/chart2/source/model/main/PageBackground.hxx @@ -52,12 +52,9 @@ public: virtual ~PageBackground() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; /// merge XInterface implementations DECLARE_XINTERFACE() @@ -66,38 +63,31 @@ protected: explicit PageBackground( const PageBackground & rOther ); // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; // ____ OPropertySet ____ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // ____ XModifyListener ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; // ____ OPropertySet ____ virtual void firePropertyChangeEvent() override; diff --git a/chart2/source/model/main/PolarCoordinateSystem.cxx b/chart2/source/model/main/PolarCoordinateSystem.cxx index 6c26feb60da2..e4ae8792000d 100644 --- a/chart2/source/model/main/PolarCoordinateSystem.cxx +++ b/chart2/source/model/main/PolarCoordinateSystem.cxx @@ -55,39 +55,33 @@ PolarCoordinateSystem::~PolarCoordinateSystem() // ____ XCoordinateSystem ____ OUString SAL_CALL PolarCoordinateSystem::getCoordinateSystemType() - throw (RuntimeException, std::exception) { return OUString(CHART2_COOSYSTEM_POLAR_SERVICE_NAME); } OUString SAL_CALL PolarCoordinateSystem::getViewServiceName() - throw (RuntimeException, std::exception) { return OUString(CHART2_COOSYSTEM_POLAR_VIEW_SERVICE_NAME); } // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL PolarCoordinateSystem::createClone() - throw (RuntimeException, std::exception) { return Reference< util::XCloneable >( new PolarCoordinateSystem( *this )); } // ____ XServiceInfo ____ OUString SAL_CALL PolarCoordinateSystem::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.PolarCoordinateSystem"); } sal_Bool SAL_CALL PolarCoordinateSystem::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL PolarCoordinateSystem::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CHART2_COOSYSTEM_POLAR_SERVICE_NAME }; } @@ -104,19 +98,16 @@ PolarCoordinateSystem2d::~PolarCoordinateSystem2d() // ____ XServiceInfo ____ OUString SAL_CALL PolarCoordinateSystem2d::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart2.PolarCoordinateSystem2d") ; } sal_Bool SAL_CALL PolarCoordinateSystem2d::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL PolarCoordinateSystem2d::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CHART2_COOSYSTEM_POLAR_SERVICE_NAME, @@ -135,19 +126,16 @@ PolarCoordinateSystem3d::~PolarCoordinateSystem3d() // ____ XServiceInfo ____ OUString SAL_CALL PolarCoordinateSystem3d::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart2.PolarCoordinateSystem3d"); } sal_Bool SAL_CALL PolarCoordinateSystem3d::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL PolarCoordinateSystem3d::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CHART2_COOSYSTEM_POLAR_SERVICE_NAME, diff --git a/chart2/source/model/main/StockBar.cxx b/chart2/source/model/main/StockBar.cxx index 206e48bd85d9..480cc29a41d0 100644 --- a/chart2/source/model/main/StockBar.cxx +++ b/chart2/source/model/main/StockBar.cxx @@ -138,14 +138,12 @@ StockBar::~StockBar() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL StockBar::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new StockBar( *this )); } // ____ OPropertySet ____ uno::Any StockBar::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticStockBarDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -161,14 +159,12 @@ uno::Any StockBar::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL StockBar::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticStockBarInfo::get(); } // ____ XModifyBroadcaster ____ void SAL_CALL StockBar::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -182,7 +178,6 @@ void SAL_CALL StockBar::addModifyListener( const uno::Reference< util::XModifyLi } void SAL_CALL StockBar::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -197,14 +192,12 @@ void SAL_CALL StockBar::removeModifyListener( const uno::Reference< util::XModif // ____ XModifyListener ____ void SAL_CALL StockBar::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { m_xModifyEventForwarder->modified( aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL StockBar::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException, std::exception) { // nothing } diff --git a/chart2/source/model/main/Title.cxx b/chart2/source/model/main/Title.cxx index 621ec2b3143a..042b8ad18ec5 100644 --- a/chart2/source/model/main/Title.cxx +++ b/chart2/source/model/main/Title.cxx @@ -265,21 +265,18 @@ Title::~Title() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL Title::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new Title( *this )); } // ____ XTitle ____ uno::Sequence< uno::Reference< chart2::XFormattedString > > SAL_CALL Title::getText() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); return m_aStrings; } void SAL_CALL Title::setText( const uno::Sequence< uno::Reference< chart2::XFormattedString > >& rNewStrings ) - throw (uno::RuntimeException, std::exception) { uno::Sequence< uno::Reference< chart2::XFormattedString > > aOldStrings; { @@ -297,7 +294,6 @@ void SAL_CALL Title::setText( const uno::Sequence< uno::Reference< chart2::XForm // ____ OPropertySet ____ uno::Any Title::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticTitleDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -313,14 +309,12 @@ uno::Any Title::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL Title::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticTitleInfo::get(); } // ____ XModifyBroadcaster ____ void SAL_CALL Title::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -334,7 +328,6 @@ void SAL_CALL Title::addModifyListener( const uno::Reference< util::XModifyListe } void SAL_CALL Title::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -349,14 +342,12 @@ void SAL_CALL Title::removeModifyListener( const uno::Reference< util::XModifyLi // ____ XModifyListener ____ void SAL_CALL Title::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { m_xModifyEventForwarder->modified( aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL Title::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException, std::exception) { // nothing } @@ -373,19 +364,16 @@ void Title::fireModifyEvent() } OUString SAL_CALL Title::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart2.Title"); } sal_Bool SAL_CALL Title::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL Title::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart2.Title", diff --git a/chart2/source/model/main/Title.hxx b/chart2/source/model/main/Title.hxx index e6ff363c6019..95545cd8f8d7 100644 --- a/chart2/source/model/main/Title.hxx +++ b/chart2/source/model/main/Title.hxx @@ -53,12 +53,9 @@ public: virtual ~Title() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; /// merge XInterface implementations DECLARE_XINTERFACE() @@ -69,44 +66,35 @@ protected: explicit Title( const Title & rOther ); // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; // ____ OPropertySet ____ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XTitle ____ - virtual css::uno::Sequence< css::uno::Reference< css::chart2::XFormattedString > > SAL_CALL getText() - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setText( const css::uno::Sequence< css::uno::Reference< css::chart2::XFormattedString > >& Strings ) - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Reference< css::chart2::XFormattedString > > SAL_CALL getText() override; + virtual void SAL_CALL setText( const css::uno::Sequence< css::uno::Reference< css::chart2::XFormattedString > >& Strings ) override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // ____ XModifyListener ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; // ____ OPropertySet ____ virtual void firePropertyChangeEvent() override; diff --git a/chart2/source/model/main/UndoManager.cxx b/chart2/source/model/main/UndoManager.cxx index 08095b2c77fc..664149926c26 100644 --- a/chart2/source/model/main/UndoManager.cxx +++ b/chart2/source/model/main/UndoManager.cxx @@ -197,31 +197,31 @@ namespace chart m_pImpl->disposing(); } - void SAL_CALL UndoManager::enterUndoContext( const OUString& i_title ) throw (RuntimeException, std::exception) + void SAL_CALL UndoManager::enterUndoContext( const OUString& i_title ) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().enterUndoContext( i_title, aGuard ); } - void SAL_CALL UndoManager::enterHiddenUndoContext( ) throw (EmptyUndoStackException, RuntimeException, std::exception) + void SAL_CALL UndoManager::enterHiddenUndoContext( ) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().enterHiddenUndoContext( aGuard ); } - void SAL_CALL UndoManager::leaveUndoContext( ) throw (InvalidStateException, RuntimeException, std::exception) + void SAL_CALL UndoManager::leaveUndoContext( ) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().leaveUndoContext( aGuard ); } - void SAL_CALL UndoManager::addUndoAction( const Reference< XUndoAction >& i_action ) throw (IllegalArgumentException, RuntimeException, std::exception) + void SAL_CALL UndoManager::addUndoAction( const Reference< XUndoAction >& i_action ) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().addUndoAction( i_action, aGuard ); } - void SAL_CALL UndoManager::undo( ) throw (EmptyUndoStackException, UndoContextNotClosedException, UndoFailedException, RuntimeException, std::exception) + void SAL_CALL UndoManager::undo( ) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().undo( aGuard ); @@ -229,7 +229,7 @@ namespace chart ChartViewHelper::setViewToDirtyState( Reference< XModel >( getParent(), UNO_QUERY ) ); } - void SAL_CALL UndoManager::redo( ) throw (EmptyUndoStackException, UndoContextNotClosedException, UndoFailedException, RuntimeException, std::exception) + void SAL_CALL UndoManager::redo( ) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().redo( aGuard ); @@ -237,110 +237,110 @@ namespace chart ChartViewHelper::setViewToDirtyState( Reference< XModel >( getParent(), UNO_QUERY ) ); } - sal_Bool SAL_CALL UndoManager::isUndoPossible( ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL UndoManager::isUndoPossible( ) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().isUndoPossible(); } - sal_Bool SAL_CALL UndoManager::isRedoPossible( ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL UndoManager::isRedoPossible( ) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().isRedoPossible(); } - OUString SAL_CALL UndoManager::getCurrentUndoActionTitle( ) throw (EmptyUndoStackException, RuntimeException, std::exception) + OUString SAL_CALL UndoManager::getCurrentUndoActionTitle( ) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().getCurrentUndoActionTitle(); } - OUString SAL_CALL UndoManager::getCurrentRedoActionTitle( ) throw (EmptyUndoStackException, RuntimeException, std::exception) + OUString SAL_CALL UndoManager::getCurrentRedoActionTitle( ) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().getCurrentRedoActionTitle(); } - Sequence< OUString > SAL_CALL UndoManager::getAllUndoActionTitles( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL UndoManager::getAllUndoActionTitles( ) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().getAllUndoActionTitles(); } - Sequence< OUString > SAL_CALL UndoManager::getAllRedoActionTitles( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL UndoManager::getAllRedoActionTitles( ) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().getAllRedoActionTitles(); } - void SAL_CALL UndoManager::clear( ) throw (UndoContextNotClosedException, RuntimeException, std::exception) + void SAL_CALL UndoManager::clear( ) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().clear( aGuard ); } - void SAL_CALL UndoManager::clearRedo( ) throw (UndoContextNotClosedException, RuntimeException, std::exception) + void SAL_CALL UndoManager::clearRedo( ) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().clearRedo( aGuard ); } - void SAL_CALL UndoManager::reset( ) throw (RuntimeException, std::exception) + void SAL_CALL UndoManager::reset( ) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().reset( aGuard ); } - void SAL_CALL UndoManager::addUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) throw (RuntimeException, std::exception) + void SAL_CALL UndoManager::addUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().addUndoManagerListener( i_listener ); } - void SAL_CALL UndoManager::removeUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) throw (RuntimeException, std::exception) + void SAL_CALL UndoManager::removeUndoManagerListener( const Reference< XUndoManagerListener >& i_listener ) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().removeUndoManagerListener( i_listener ); } - void SAL_CALL UndoManager::lock( ) throw (RuntimeException, std::exception) + void SAL_CALL UndoManager::lock( ) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().lock(); } - void SAL_CALL UndoManager::unlock( ) throw (NotLockedException, RuntimeException, std::exception) + void SAL_CALL UndoManager::unlock( ) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().unlock(); } - sal_Bool SAL_CALL UndoManager::isLocked( ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL UndoManager::isLocked( ) { UndoManagerMethodGuard aGuard( *m_pImpl ); return m_pImpl->getUndoHelper().isLocked(); } - Reference< XInterface > SAL_CALL UndoManager::getParent( ) throw (RuntimeException, std::exception) + Reference< XInterface > SAL_CALL UndoManager::getParent( ) { UndoManagerMethodGuard aGuard( *m_pImpl ); return *&m_pImpl->getParent(); } - void SAL_CALL UndoManager::setParent( const Reference< XInterface >& i_parent ) throw (NoSupportException, RuntimeException, std::exception) + void SAL_CALL UndoManager::setParent( const Reference< XInterface >& i_parent ) { UndoManagerMethodGuard aGuard( *m_pImpl ); (void)i_parent; throw NoSupportException( OUString(), m_pImpl->getThis() ); } - void SAL_CALL UndoManager::addModifyListener( const Reference< XModifyListener >& i_listener ) throw (RuntimeException, std::exception) + void SAL_CALL UndoManager::addModifyListener( const Reference< XModifyListener >& i_listener ) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().addModifyListener( i_listener ); } - void SAL_CALL UndoManager::removeModifyListener( const Reference< XModifyListener >& i_listener ) throw (RuntimeException, std::exception) + void SAL_CALL UndoManager::removeModifyListener( const Reference< XModifyListener >& i_listener ) { UndoManagerMethodGuard aGuard( *m_pImpl ); m_pImpl->getUndoHelper().removeModifyListener( i_listener ); diff --git a/chart2/source/model/main/UndoManager.hxx b/chart2/source/model/main/UndoManager.hxx index 8c07a8dcc9e9..47b4e82aca2b 100644 --- a/chart2/source/model/main/UndoManager.hxx +++ b/chart2/source/model/main/UndoManager.hxx @@ -53,36 +53,36 @@ namespace chart void disposing(); // XUndoManager - virtual void SAL_CALL enterUndoContext( const OUString& i_title ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL enterHiddenUndoContext( ) throw (css::document::EmptyUndoStackException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL leaveUndoContext( ) throw (css::util::InvalidStateException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addUndoAction( const css::uno::Reference< css::document::XUndoAction >& i_action ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL undo( ) throw (css::document::EmptyUndoStackException, css::document::UndoContextNotClosedException, css::document::UndoFailedException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL redo( ) throw (css::document::EmptyUndoStackException, css::document::UndoContextNotClosedException, css::document::UndoFailedException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isUndoPossible( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isRedoPossible( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCurrentUndoActionTitle( ) throw (css::document::EmptyUndoStackException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCurrentRedoActionTitle( ) throw (css::document::EmptyUndoStackException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getAllUndoActionTitles( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getAllRedoActionTitles( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clear( ) throw (css::document::UndoContextNotClosedException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearRedo( ) throw (css::document::UndoContextNotClosedException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL reset( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addUndoManagerListener( const css::uno::Reference< css::document::XUndoManagerListener >& i_listener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeUndoManagerListener( const css::uno::Reference< css::document::XUndoManagerListener >& i_listener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL enterUndoContext( const OUString& i_title ) override; + virtual void SAL_CALL enterHiddenUndoContext( ) override; + virtual void SAL_CALL leaveUndoContext( ) override; + virtual void SAL_CALL addUndoAction( const css::uno::Reference< css::document::XUndoAction >& i_action ) override; + virtual void SAL_CALL undo( ) override; + virtual void SAL_CALL redo( ) override; + virtual sal_Bool SAL_CALL isUndoPossible( ) override; + virtual sal_Bool SAL_CALL isRedoPossible( ) override; + virtual OUString SAL_CALL getCurrentUndoActionTitle( ) override; + virtual OUString SAL_CALL getCurrentRedoActionTitle( ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAllUndoActionTitles( ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getAllRedoActionTitles( ) override; + virtual void SAL_CALL clear( ) override; + virtual void SAL_CALL clearRedo( ) override; + virtual void SAL_CALL reset( ) override; + virtual void SAL_CALL addUndoManagerListener( const css::uno::Reference< css::document::XUndoManagerListener >& i_listener ) override; + virtual void SAL_CALL removeUndoManagerListener( const css::uno::Reference< css::document::XUndoManagerListener >& i_listener ) override; // XLockable (base of XUndoManager) - virtual void SAL_CALL lock( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL unlock( ) throw (css::util::NotLockedException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isLocked( ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL lock( ) override; + virtual void SAL_CALL unlock( ) override; + virtual sal_Bool SAL_CALL isLocked( ) override; // XChild (base of XUndoManager) - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) override; + virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override; // XModifyBroadcaster - virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override; + virtual void SAL_CALL removeModifyListener( const css::uno::Reference< css::util::XModifyListener >& aListener ) override; private: std::unique_ptr< impl::UndoManager_Impl > m_pImpl; diff --git a/chart2/source/model/main/Wall.cxx b/chart2/source/model/main/Wall.cxx index d47824fef502..dae09c4ac598 100644 --- a/chart2/source/model/main/Wall.cxx +++ b/chart2/source/model/main/Wall.cxx @@ -131,14 +131,12 @@ Wall::~Wall() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL Wall::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new Wall( *this )); } // ____ OPropertySet ____ uno::Any Wall::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticWallDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -154,14 +152,12 @@ uno::Any Wall::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL Wall::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticWallInfo::get(); } // ____ XModifyBroadcaster ____ void SAL_CALL Wall::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -175,7 +171,6 @@ void SAL_CALL Wall::addModifyListener( const uno::Reference< util::XModifyListen } void SAL_CALL Wall::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -190,14 +185,12 @@ void SAL_CALL Wall::removeModifyListener( const uno::Reference< util::XModifyLis // ____ XModifyListener ____ void SAL_CALL Wall::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { m_xModifyEventForwarder->modified( aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL Wall::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException, std::exception) { // nothing } diff --git a/chart2/source/model/main/Wall.hxx b/chart2/source/model/main/Wall.hxx index 5a67938c1684..eede7dca5278 100644 --- a/chart2/source/model/main/Wall.hxx +++ b/chart2/source/model/main/Wall.hxx @@ -58,38 +58,31 @@ protected: explicit Wall( const Wall & rOther ); // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; // ____ OPropertySet ____ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // ____ XModifyListener ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; // ____ OPropertySet ____ virtual void firePropertyChangeEvent() override; diff --git a/chart2/source/model/template/AreaChartType.cxx b/chart2/source/model/template/AreaChartType.cxx index 21d96fac7e9d..163ba7863c7d 100644 --- a/chart2/source/model/template/AreaChartType.cxx +++ b/chart2/source/model/template/AreaChartType.cxx @@ -41,32 +41,27 @@ AreaChartType::~AreaChartType() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL AreaChartType::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new AreaChartType( *this )); } // ____ XChartType ____ OUString SAL_CALL AreaChartType::getChartType() - throw (uno::RuntimeException, std::exception) { return OUString(CHART2_SERVICE_NAME_CHARTTYPE_AREA); } OUString SAL_CALL AreaChartType::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.AreaChartType"); } sal_Bool SAL_CALL AreaChartType::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL AreaChartType::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CHART2_SERVICE_NAME_CHARTTYPE_AREA, diff --git a/chart2/source/model/template/AreaChartType.hxx b/chart2/source/model/template/AreaChartType.hxx index 2a9c99f5cd1d..9cbc090f8e3f 100644 --- a/chart2/source/model/template/AreaChartType.hxx +++ b/chart2/source/model/template/AreaChartType.hxx @@ -31,25 +31,20 @@ public: virtual ~AreaChartType() override; virtual OUString SAL_CALL - getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; + supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; protected: explicit AreaChartType( const AreaChartType & rOther ); // ____ XChartType ____ - virtual OUString SAL_CALL getChartType() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getChartType() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; }; } // namespace chart diff --git a/chart2/source/model/template/AreaChartTypeTemplate.cxx b/chart2/source/model/template/AreaChartTypeTemplate.cxx index d26bc1569ddc..3353d0d752f7 100644 --- a/chart2/source/model/template/AreaChartTypeTemplate.cxx +++ b/chart2/source/model/template/AreaChartTypeTemplate.cxx @@ -130,7 +130,6 @@ AreaChartTypeTemplate::~AreaChartTypeTemplate() // ____ OPropertySet ____ uno::Any AreaChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticAreaChartTypeTemplateDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -146,7 +145,6 @@ uno::Any AreaChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL AreaChartTypeTemplate::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticAreaChartTypeTemplateInfo::get(); } @@ -179,14 +177,12 @@ void SAL_CALL AreaChartTypeTemplate::applyStyle( ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (uno::RuntimeException, std::exception) { ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::makeAny( drawing::LineStyle_NONE ) ); } void SAL_CALL AreaChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram >& xDiagram ) - throw (uno::RuntimeException, std::exception) { ChartTypeTemplate::resetStyles( xDiagram ); ::std::vector< Reference< chart2::XDataSeries > > aSeriesVec( @@ -227,7 +223,6 @@ Reference< chart2::XChartType > AreaChartTypeTemplate::getChartTypeForIndex( sal Reference< chart2::XChartType > SAL_CALL AreaChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (uno::RuntimeException, std::exception) { Reference< chart2::XChartType > xResult( getChartTypeForIndex( 0 ) ); ChartTypeTemplate::copyPropertiesFromOldToNewCoordinateSystem( aFormerlyUsedChartTypes, xResult ); diff --git a/chart2/source/model/template/AreaChartTypeTemplate.hxx b/chart2/source/model/template/AreaChartTypeTemplate.hxx index 83d73c1687e6..2fc2f9b0a0d4 100644 --- a/chart2/source/model/template/AreaChartTypeTemplate.hxx +++ b/chart2/source/model/template/AreaChartTypeTemplate.hxx @@ -49,29 +49,24 @@ public: protected: // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XChartTypeTemplate ____ virtual css::uno::Reference< css::chart2::XChartType > SAL_CALL getChartTypeForNewSeries( const css::uno::Sequence< - css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) override; virtual void SAL_CALL applyStyle( const css::uno::Reference< css::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, - ::sal_Int32 nSeriesCount ) - throw (css::uno::RuntimeException, std::exception) override; + ::sal_Int32 nSeriesCount ) override; virtual void SAL_CALL resetStyles( - const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) override; // ____ ChartTypeTemplate ____ virtual css::uno::Reference< css::chart2::XChartType > diff --git a/chart2/source/model/template/BarChartType.cxx b/chart2/source/model/template/BarChartType.cxx index 3a61a04dc177..0a05980def8a 100644 --- a/chart2/source/model/template/BarChartType.cxx +++ b/chart2/source/model/template/BarChartType.cxx @@ -42,20 +42,17 @@ BarChartType::~BarChartType() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL BarChartType::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new BarChartType( *this )); } // ____ XChartType ____ OUString SAL_CALL BarChartType::getChartType() - throw (uno::RuntimeException, std::exception) { return OUString(CHART2_SERVICE_NAME_CHARTTYPE_BAR); } uno::Sequence< OUString > BarChartType::getSupportedPropertyRoles() - throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aPropRoles(2); aPropRoles[0] = "FillColor"; @@ -65,19 +62,16 @@ uno::Sequence< OUString > BarChartType::getSupportedPropertyRoles() } OUString SAL_CALL BarChartType::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.BarChartType"); } sal_Bool SAL_CALL BarChartType::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL BarChartType::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CHART2_SERVICE_NAME_CHARTTYPE_BAR, diff --git a/chart2/source/model/template/BarChartType.hxx b/chart2/source/model/template/BarChartType.hxx index 6c79298d6609..0db8a8b7d5d5 100644 --- a/chart2/source/model/template/BarChartType.hxx +++ b/chart2/source/model/template/BarChartType.hxx @@ -31,28 +31,22 @@ public: virtual ~BarChartType() override; virtual OUString SAL_CALL - getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; + supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; protected: explicit BarChartType( const BarChartType & rOther ); // ____ XChartType ____ - virtual OUString SAL_CALL getChartType() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getChartType() override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedPropertyRoles() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedPropertyRoles() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; }; } // namespace chart diff --git a/chart2/source/model/template/BarChartTypeTemplate.cxx b/chart2/source/model/template/BarChartTypeTemplate.cxx index 1296b5215b05..b06e7bb08746 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.cxx +++ b/chart2/source/model/template/BarChartTypeTemplate.cxx @@ -162,7 +162,6 @@ bool BarChartTypeTemplate::isSwapXAndY() const sal_Bool SAL_CALL BarChartTypeTemplate::matchesTemplate( const Reference< chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (uno::RuntimeException, std::exception) { bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties ); @@ -217,7 +216,6 @@ Reference< chart2::XChartType > BarChartTypeTemplate::getChartTypeForIndex( sal_ Reference< chart2::XChartType > SAL_CALL BarChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (uno::RuntimeException, std::exception) { Reference< chart2::XChartType > xResult( getChartTypeForIndex( 0 ) ); ChartTypeTemplate::copyPropertiesFromOldToNewCoordinateSystem( aFormerlyUsedChartTypes, xResult ); @@ -226,7 +224,6 @@ Reference< chart2::XChartType > SAL_CALL BarChartTypeTemplate::getChartTypeForNe // ____ OPropertySet ____ uno::Any BarChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticBarChartTypeTemplateDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -242,7 +239,6 @@ uno::Any BarChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL BarChartTypeTemplate::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticBarChartTypeTemplateInfo::get(); } @@ -252,7 +248,6 @@ void SAL_CALL BarChartTypeTemplate::applyStyle( ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (uno::RuntimeException, std::exception) { ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::makeAny( drawing::LineStyle_NONE ) ); @@ -274,7 +269,6 @@ void SAL_CALL BarChartTypeTemplate::applyStyle( void SAL_CALL BarChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram >& xDiagram ) - throw (uno::RuntimeException, std::exception) { ChartTypeTemplate::resetStyles( xDiagram ); ::std::vector< Reference< chart2::XDataSeries > > aSeriesVec( diff --git a/chart2/source/model/template/BarChartTypeTemplate.hxx b/chart2/source/model/template/BarChartTypeTemplate.hxx index 73b98fa1fe56..79b440548356 100644 --- a/chart2/source/model/template/BarChartTypeTemplate.hxx +++ b/chart2/source/model/template/BarChartTypeTemplate.hxx @@ -56,33 +56,27 @@ public: protected: // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL matchesTemplate( const css::uno::Reference< css::chart2::XDiagram >& xDiagram, - sal_Bool bAdaptProperties ) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool bAdaptProperties ) override; virtual css::uno::Reference< css::chart2::XChartType > SAL_CALL getChartTypeForNewSeries( const css::uno::Sequence< - css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) override; virtual void SAL_CALL applyStyle( const css::uno::Reference< css::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, - ::sal_Int32 nSeriesCount ) - throw (css::uno::RuntimeException, std::exception) override; + ::sal_Int32 nSeriesCount ) override; virtual void SAL_CALL resetStyles( - const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) override; // ____ ChartTypeTemplate ____ virtual css::uno::Reference< css::chart2::XChartType > diff --git a/chart2/source/model/template/BubbleChartType.cxx b/chart2/source/model/template/BubbleChartType.cxx index ba23686d24d7..4af09ba28611 100644 --- a/chart2/source/model/template/BubbleChartType.cxx +++ b/chart2/source/model/template/BubbleChartType.cxx @@ -110,7 +110,6 @@ BubbleChartType::~BubbleChartType() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL BubbleChartType::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new BubbleChartType( *this )); } @@ -118,8 +117,6 @@ uno::Reference< util::XCloneable > SAL_CALL BubbleChartType::createClone() // ____ XChartType ____ Reference< chart2::XCoordinateSystem > SAL_CALL BubbleChartType::createCoordinateSystem( ::sal_Int32 DimensionCount ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { Reference< chart2::XCoordinateSystem > xResult( new CartesianCoordinateSystem( GetComponentContext(), DimensionCount )); @@ -149,13 +146,11 @@ Reference< chart2::XCoordinateSystem > SAL_CALL } OUString SAL_CALL BubbleChartType::getChartType() - throw (uno::RuntimeException, std::exception) { return OUString(CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE); } uno::Sequence< OUString > SAL_CALL BubbleChartType::getSupportedMandatoryRoles() - throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aMandRolesSeq(4); aMandRolesSeq[0] = "label"; @@ -166,7 +161,6 @@ uno::Sequence< OUString > SAL_CALL BubbleChartType::getSupportedMandatoryRoles() } uno::Sequence< OUString > SAL_CALL BubbleChartType::getSupportedPropertyRoles() - throw(css::uno::RuntimeException, std::exception) { uno::Sequence< OUString > aPropertyRoles(2); aPropertyRoles[0] = "FillColor"; @@ -175,14 +169,12 @@ uno::Sequence< OUString > SAL_CALL BubbleChartType::getSupportedPropertyRoles() } OUString SAL_CALL BubbleChartType::getRoleOfSequenceForSeriesLabel() - throw (uno::RuntimeException, std::exception) { return OUString("values-size"); } // ____ OPropertySet ____ uno::Any BubbleChartType::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticBubbleChartTypeDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -199,25 +191,21 @@ uno::Any BubbleChartType::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL BubbleChartType::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticBubbleChartTypeInfo::get(); } OUString SAL_CALL BubbleChartType::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.BubbleChartType"); } sal_Bool SAL_CALL BubbleChartType::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL BubbleChartType::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE, diff --git a/chart2/source/model/template/BubbleChartType.hxx b/chart2/source/model/template/BubbleChartType.hxx index cc0e94406f45..c3248c0b1a4a 100644 --- a/chart2/source/model/template/BubbleChartType.hxx +++ b/chart2/source/model/template/BubbleChartType.hxx @@ -33,49 +33,37 @@ public: virtual ~BubbleChartType() override; virtual OUString SAL_CALL - getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; + supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; protected: explicit BubbleChartType( const BubbleChartType & rOther ); // ____ XChartType ____ - virtual OUString SAL_CALL getChartType() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getChartType() override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedMandatoryRoles() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedMandatoryRoles() override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedPropertyRoles() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedPropertyRoles() override; virtual css::uno::Reference< css::chart2::XCoordinateSystem > SAL_CALL - createCoordinateSystem( ::sal_Int32 DimensionCount ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel() - throw (css::uno::RuntimeException, std::exception) override; + createCoordinateSystem( ::sal_Int32 DimensionCount ) override; + virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel() override; // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; // ____ OPropertySet ____ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; }; } // namespace chart diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.cxx b/chart2/source/model/template/BubbleChartTypeTemplate.cxx index dfda9beab891..78a297305aa1 100644 --- a/chart2/source/model/template/BubbleChartTypeTemplate.cxx +++ b/chart2/source/model/template/BubbleChartTypeTemplate.cxx @@ -111,7 +111,6 @@ BubbleChartTypeTemplate::~BubbleChartTypeTemplate() // ____ OPropertySet ____ uno::Any BubbleChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticBubbleChartTypeTemplateDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -127,7 +126,6 @@ uno::Any BubbleChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL BubbleChartTypeTemplate::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticBubbleChartTypeTemplateInfo::get(); } @@ -147,7 +145,6 @@ void SAL_CALL BubbleChartTypeTemplate::applyStyle( ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (uno::RuntimeException, std::exception) { ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); DataSeriesHelper::setPropertyAlsoToAllAttributedDataPoints( xSeries, "BorderStyle", uno::makeAny( drawing::LineStyle_NONE ) ); @@ -155,7 +152,6 @@ void SAL_CALL BubbleChartTypeTemplate::applyStyle( // ____ XChartTypeTemplate ____ sal_Bool SAL_CALL BubbleChartTypeTemplate::supportsCategories() - throw (uno::RuntimeException, std::exception) { return false; } @@ -181,7 +177,6 @@ Reference< chart2::XChartType > BubbleChartTypeTemplate::getChartTypeForIndex( s Reference< chart2::XChartType > SAL_CALL BubbleChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (uno::RuntimeException, std::exception) { Reference< chart2::XChartType > xResult; @@ -203,7 +198,6 @@ Reference< chart2::XChartType > SAL_CALL BubbleChartTypeTemplate::getChartTypeFo } Reference< chart2::XDataInterpreter > SAL_CALL BubbleChartTypeTemplate::getDataInterpreter() - throw (uno::RuntimeException, std::exception) { if( ! m_xDataInterpreter.is()) m_xDataInterpreter.set( new BubbleDataInterpreter ); diff --git a/chart2/source/model/template/BubbleChartTypeTemplate.hxx b/chart2/source/model/template/BubbleChartTypeTemplate.hxx index e5e135726f5f..a57b6e4104e4 100644 --- a/chart2/source/model/template/BubbleChartTypeTemplate.hxx +++ b/chart2/source/model/template/BubbleChartTypeTemplate.hxx @@ -45,29 +45,23 @@ public: protected: // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XChartTypeTemplate ____ - virtual sal_Bool SAL_CALL supportsCategories() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsCategories() override; virtual css::uno::Reference< css::chart2::XChartType > SAL_CALL - getChartTypeForNewSeries( const css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() - throw (css::uno::RuntimeException, std::exception) override; + getChartTypeForNewSeries( const css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) override; + virtual css::uno::Reference< css::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() override; virtual void SAL_CALL applyStyle( const css::uno::Reference< css::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, - ::sal_Int32 nSeriesCount ) - throw (css::uno::RuntimeException, std::exception) override; + ::sal_Int32 nSeriesCount ) override; // ____ ChartTypeTemplate ____ virtual css::uno::Reference< css::chart2::XChartType > diff --git a/chart2/source/model/template/BubbleDataInterpreter.cxx b/chart2/source/model/template/BubbleDataInterpreter.cxx index 76b202829e75..a43356152f7e 100644 --- a/chart2/source/model/template/BubbleDataInterpreter.cxx +++ b/chart2/source/model/template/BubbleDataInterpreter.cxx @@ -50,7 +50,6 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::interpretDataSource( const Reference< chart2::data::XDataSource >& xSource, const Sequence< beans::PropertyValue >& aArguments, const Sequence< Reference< XDataSeries > >& aSeriesToReUse ) - throw (uno::RuntimeException, std::exception) { if( ! xSource.is()) return InterpretedData(); @@ -159,7 +158,6 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::interpretDataSource( chart2::InterpretedData SAL_CALL BubbleDataInterpreter::reinterpretDataSeries( const chart2::InterpretedData& aInterpretedData ) - throw (uno::RuntimeException, std::exception) { InterpretedData aResult( aInterpretedData ); @@ -270,7 +268,6 @@ chart2::InterpretedData SAL_CALL BubbleDataInterpreter::reinterpretDataSeries( sal_Bool SAL_CALL BubbleDataInterpreter::isDataCompatible( const chart2::InterpretedData& aInterpretedData ) - throw (uno::RuntimeException, std::exception) { Sequence< Reference< XDataSeries > > aSeries( FlattenSequence( aInterpretedData.Series )); for( sal_Int32 i=0; i& xSource, const css::uno::Sequence< css::beans::PropertyValue >& aArguments, - const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aSeriesToReUse ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aSeriesToReUse ) override; virtual css::chart2::InterpretedData SAL_CALL reinterpretDataSeries( - const css::chart2::InterpretedData& aInterpretedData ) - throw (css::uno::RuntimeException, std::exception) override; + const css::chart2::InterpretedData& aInterpretedData ) override; virtual sal_Bool SAL_CALL isDataCompatible( - const css::chart2::InterpretedData& aInterpretedData ) - throw (css::uno::RuntimeException, std::exception) override; + const css::chart2::InterpretedData& aInterpretedData ) override; }; } // namespace chart diff --git a/chart2/source/model/template/CandleStickChartType.cxx b/chart2/source/model/template/CandleStickChartType.cxx index 3062cc2151c7..22c74c5ff7ea 100644 --- a/chart2/source/model/template/CandleStickChartType.cxx +++ b/chart2/source/model/template/CandleStickChartType.cxx @@ -206,20 +206,17 @@ CandleStickChartType::~CandleStickChartType() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL CandleStickChartType::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new CandleStickChartType( *this )); } // ____ XChartType ____ OUString SAL_CALL CandleStickChartType::getChartType() - throw (uno::RuntimeException, std::exception) { return OUString(CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK); } uno::Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedMandatoryRoles() - throw (uno::RuntimeException, std::exception) { bool bShowFirst = true; bool bShowHiLow = false; @@ -244,7 +241,6 @@ uno::Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedMandatoryRo } Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedOptionalRoles() - throw (uno::RuntimeException, std::exception) { bool bShowFirst = true; bool bShowHiLow = false; @@ -266,14 +262,12 @@ Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedOptionalRoles() } OUString SAL_CALL CandleStickChartType::getRoleOfSequenceForSeriesLabel() - throw (uno::RuntimeException, std::exception) { return OUString("values-last"); } // ____ OPropertySet ____ uno::Any CandleStickChartType::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticCandleStickChartTypeDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -290,14 +284,12 @@ uno::Any CandleStickChartType::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL CandleStickChartType::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticCandleStickChartTypeInfo::get(); } void SAL_CALL CandleStickChartType::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const uno::Any& rValue ) - throw (uno::Exception, std::exception) { if( nHandle == PROP_CANDLESTICKCHARTTYPE_WHITE_DAY || nHandle == PROP_CANDLESTICKCHARTTYPE_BLACK_DAY ) @@ -325,19 +317,16 @@ void SAL_CALL CandleStickChartType::setFastPropertyValue_NoBroadcast( } OUString SAL_CALL CandleStickChartType::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.CandleStickChartType") ; } sal_Bool SAL_CALL CandleStickChartType::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL CandleStickChartType::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK, diff --git a/chart2/source/model/template/CandleStickChartType.hxx b/chart2/source/model/template/CandleStickChartType.hxx index 1bbca51d7814..2e9ae89256f7 100644 --- a/chart2/source/model/template/CandleStickChartType.hxx +++ b/chart2/source/model/template/CandleStickChartType.hxx @@ -32,33 +32,25 @@ public: virtual ~CandleStickChartType() override; virtual OUString SAL_CALL - getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; + supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; protected: explicit CandleStickChartType( const CandleStickChartType & rOther ); // ____ XChartType ____ - virtual OUString SAL_CALL getChartType() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getChartType() override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedMandatoryRoles() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedMandatoryRoles() override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedOptionalRoles() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedOptionalRoles() override; + virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel() override; // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; // ____ OPropertySet ____ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; @@ -66,17 +58,14 @@ protected: // ____ OPropertySet ____ virtual void SAL_CALL setFastPropertyValue_NoBroadcast ( sal_Int32 nHandle, - const css::uno::Any& rValue ) - throw (css::uno::Exception, std::exception) override; + const css::uno::Any& rValue ) override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; }; } // namespace chart diff --git a/chart2/source/model/template/ChartType.cxx b/chart2/source/model/template/ChartType.cxx index 479e6c1a7190..e17a5344542d 100644 --- a/chart2/source/model/template/ChartType.cxx +++ b/chart2/source/model/template/ChartType.cxx @@ -71,8 +71,6 @@ ChartType::~ChartType() // ____ XChartType ____ Reference< chart2::XCoordinateSystem > SAL_CALL ChartType::createCoordinateSystem( ::sal_Int32 DimensionCount ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { Reference< chart2::XCoordinateSystem > xResult( new CartesianCoordinateSystem( GetComponentContext(), DimensionCount )); @@ -104,7 +102,6 @@ Reference< chart2::XCoordinateSystem > SAL_CALL } Sequence< OUString > SAL_CALL ChartType::getSupportedMandatoryRoles() - throw (uno::RuntimeException, std::exception) { Sequence< OUString > aDefaultSeq(2); aDefaultSeq[0] = "label"; @@ -113,19 +110,16 @@ Sequence< OUString > SAL_CALL ChartType::getSupportedMandatoryRoles() } Sequence< OUString > SAL_CALL ChartType::getSupportedOptionalRoles() - throw (uno::RuntimeException, std::exception) { return Sequence< OUString >(); } Sequence< OUString > SAL_CALL ChartType::getSupportedPropertyRoles() - throw (uno::RuntimeException, std::exception) { return Sequence< OUString >(); } OUString SAL_CALL ChartType::getRoleOfSequenceForSeriesLabel() - throw (uno::RuntimeException, std::exception) { return OUString("values-y"); } @@ -143,8 +137,6 @@ void ChartType::impl_addDataSeriesWithoutNotification( // ____ XDataSeriesContainer ____ void SAL_CALL ChartType::addDataSeries( const Reference< chart2::XDataSeries >& xDataSeries ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -153,8 +145,6 @@ void SAL_CALL ChartType::addDataSeries( const Reference< chart2::XDataSeries >& } void SAL_CALL ChartType::removeDataSeries( const Reference< chart2::XDataSeries >& xDataSeries ) - throw (container::NoSuchElementException, - uno::RuntimeException, std::exception) { if( !xDataSeries.is()) throw container::NoSuchElementException(); @@ -175,7 +165,6 @@ void SAL_CALL ChartType::removeDataSeries( const Reference< chart2::XDataSeries } Sequence< Reference< chart2::XDataSeries > > SAL_CALL ChartType::getDataSeries() - throw (uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -183,8 +172,6 @@ Sequence< Reference< chart2::XDataSeries > > SAL_CALL ChartType::getDataSeries() } void SAL_CALL ChartType::setDataSeries( const Sequence< Reference< chart2::XDataSeries > >& aDataSeries ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { SolarMutexGuard g; @@ -210,7 +197,6 @@ void SAL_CALL ChartType::setDataSeries( const Sequence< Reference< chart2::XData // ____ OPropertySet ____ uno::Any ChartType::GetDefaultValue( sal_Int32 /* nHandle */ ) const - throw(beans::UnknownPropertyException) { return uno::Any(); } @@ -255,14 +241,12 @@ struct StaticChartTypeInfo : public rtl::StaticAggregate< uno::Reference< beans: // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL ChartType::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticChartTypeInfo::get(); } // ____ XModifyBroadcaster ____ void SAL_CALL ChartType::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -276,7 +260,6 @@ void SAL_CALL ChartType::addModifyListener( const uno::Reference< util::XModifyL } void SAL_CALL ChartType::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -291,14 +274,12 @@ void SAL_CALL ChartType::removeModifyListener( const uno::Reference< util::XModi // ____ XModifyListener ____ void SAL_CALL ChartType::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { m_xModifyEventForwarder->modified( aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL ChartType::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException, std::exception) { // nothing } diff --git a/chart2/source/model/template/ChartType.hxx b/chart2/source/model/template/ChartType.hxx index ef702bc71e46..f239f7f38824 100644 --- a/chart2/source/model/template/ChartType.hxx +++ b/chart2/source/model/template/ChartType.hxx @@ -67,63 +67,44 @@ protected: // ____ XChartType ____ // still abstract ! implement ! - virtual OUString SAL_CALL getChartType() - throw (css::uno::RuntimeException, std::exception) override = 0; + virtual OUString SAL_CALL getChartType() override = 0; virtual css::uno::Reference< css::chart2::XCoordinateSystem > SAL_CALL - createCoordinateSystem( ::sal_Int32 DimensionCount ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + createCoordinateSystem( ::sal_Int32 DimensionCount ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedMandatoryRoles() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedMandatoryRoles() override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedOptionalRoles() - throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedOptionalRoles() override; + virtual OUString SAL_CALL getRoleOfSequenceForSeriesLabel() override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedPropertyRoles() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedPropertyRoles() override; // ____ XDataSeriesContainer ____ virtual void SAL_CALL addDataSeries( - const css::uno::Reference< css::chart2::XDataSeries >& aDataSeries ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XDataSeries >& aDataSeries ) override; virtual void SAL_CALL removeDataSeries( - const css::uno::Reference< css::chart2::XDataSeries >& aDataSeries ) - throw (css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > > SAL_CALL getDataSeries() - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XDataSeries >& aDataSeries ) override; + virtual css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > > SAL_CALL getDataSeries() override; virtual void SAL_CALL setDataSeries( - const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aDataSeries ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aDataSeries ) override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // ____ XModifyListener ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; void fireModifyEvent(); // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; virtual void firePropertyChangeEvent() override; @@ -131,8 +112,7 @@ protected: // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; /// merge XTypeProvider implementations DECLARE_XTYPEPROVIDER() diff --git a/chart2/source/model/template/ChartTypeManager.cxx b/chart2/source/model/template/ChartTypeManager.cxx index 664f3e2eeaa4..08eba875e4b0 100644 --- a/chart2/source/model/template/ChartTypeManager.cxx +++ b/chart2/source/model/template/ChartTypeManager.cxx @@ -235,8 +235,6 @@ ChartTypeManager::~ChartTypeManager() // ____ XMultiServiceFactory ____ uno::Reference< uno::XInterface > SAL_CALL ChartTypeManager::createInstance( const OUString& aServiceSpecifier ) - throw (uno::Exception, - uno::RuntimeException, std::exception) { uno::Reference< uno::XInterface > xResult; TemplateId nId = lcl_GetTemplateIdForService( aServiceSpecifier ); @@ -558,15 +556,12 @@ uno::Reference< uno::XInterface > SAL_CALL ChartTypeManager::createInstance( uno::Reference< uno::XInterface > SAL_CALL ChartTypeManager::createInstanceWithArguments( const OUString& ServiceSpecifier, const uno::Sequence< uno::Any >& /* Arguments */ ) - throw (uno::Exception, - uno::RuntimeException, std::exception) { OSL_FAIL( "createInstanceWithArguments: No arguments supported" ); return createInstance( ServiceSpecifier ); } uno::Sequence< OUString > SAL_CALL ChartTypeManager::getAvailableServiceNames() - throw (uno::RuntimeException, std::exception) { ::std::vector< OUString > aServices; const tTemplateMapType & rMap = lcl_DefaultChartTypeMap(); @@ -604,19 +599,16 @@ uno::Sequence< OUString > SAL_CALL ChartTypeManager::getAvailableServiceNames() // ____ XServiceInfo ____ OUString SAL_CALL ChartTypeManager::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.ChartTypeManager"); } sal_Bool SAL_CALL ChartTypeManager::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL ChartTypeManager::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart2.ChartTypeManager", diff --git a/chart2/source/model/template/ChartTypeTemplate.cxx b/chart2/source/model/template/ChartTypeTemplate.cxx index 06915bab71ec..da1cfefda6bf 100644 --- a/chart2/source/model/template/ChartTypeTemplate.cxx +++ b/chart2/source/model/template/ChartTypeTemplate.cxx @@ -139,7 +139,6 @@ ChartTypeTemplate::~ChartTypeTemplate() uno::Reference< XDiagram > SAL_CALL ChartTypeTemplate::createDiagramByDataSource( const uno::Reference< data::XDataSource >& xDataSource, const uno::Sequence< beans::PropertyValue >& aArguments ) - throw (uno::RuntimeException, std::exception) { Reference< XDiagram > xDia; @@ -178,13 +177,11 @@ uno::Reference< XDiagram > SAL_CALL ChartTypeTemplate::createDiagramByDataSource } sal_Bool SAL_CALL ChartTypeTemplate::supportsCategories() - throw (css::uno::RuntimeException, ::std::exception) { return true; } void SAL_CALL ChartTypeTemplate::changeDiagram( const uno::Reference< XDiagram >& xDiagram ) - throw (uno::RuntimeException, std::exception) { if( ! xDiagram.is()) return; @@ -262,7 +259,6 @@ void SAL_CALL ChartTypeTemplate::changeDiagramData( const Reference< chart2::XDiagram >& xDiagram, const Reference< chart2::data::XDataSource >& xDataSource, const Sequence< beans::PropertyValue >& aArguments ) - throw (uno::RuntimeException, std::exception) { if( ! (xDiagram.is() && xDataSource.is()) ) @@ -313,7 +309,6 @@ void SAL_CALL ChartTypeTemplate::changeDiagramData( sal_Bool SAL_CALL ChartTypeTemplate::matchesTemplate( const Reference< chart2::XDiagram >& xDiagram, sal_Bool /* bAdaptProperties */ ) - throw (uno::RuntimeException, std::exception) { bool bResult = false; @@ -373,7 +368,6 @@ sal_Bool SAL_CALL ChartTypeTemplate::matchesTemplate( } Reference< chart2::XDataInterpreter > SAL_CALL ChartTypeTemplate::getDataInterpreter() - throw (uno::RuntimeException, std::exception) { if( ! m_xDataInterpreter.is()) m_xDataInterpreter.set( new DataInterpreter ); @@ -386,7 +380,6 @@ void SAL_CALL ChartTypeTemplate::applyStyle( ::sal_Int32 nChartTypeIndex, ::sal_Int32 /* nSeriesIndex */, ::sal_Int32 /* nSeriesCount */ ) - throw (uno::RuntimeException, std::exception) { // sset stacking mode Reference< beans::XPropertySet > xSeriesProp( xSeries, uno::UNO_QUERY ); @@ -424,7 +417,6 @@ void SAL_CALL ChartTypeTemplate::applyStyle( } void SAL_CALL ChartTypeTemplate::applyStyles( const Reference< chart2::XDiagram >& xDiagram ) - throw (uno::RuntimeException) { // apply chart-type specific styles, like "symbols on" for example Sequence< Sequence< Reference< XDataSeries > > > aNewSeriesSeq( @@ -441,7 +433,6 @@ void SAL_CALL ChartTypeTemplate::applyStyles( const Reference< chart2::XDiagram } void SAL_CALL ChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram >& xDiagram ) - throw (uno::RuntimeException, std::exception) { // reset number format if we had percent stacking on bool bPercent = (getStackMode(0) == StackMode_Y_STACKED_PERCENT); @@ -521,7 +512,6 @@ void SAL_CALL ChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram // ____ XServiceName ____ OUString SAL_CALL ChartTypeTemplate::getServiceName() - throw (uno::RuntimeException, std::exception) { return m_aServiceName; } diff --git a/chart2/source/model/template/ChartTypeTemplate.hxx b/chart2/source/model/template/ChartTypeTemplate.hxx index 6bc9fae1efc6..c32fcbd7934a 100644 --- a/chart2/source/model/template/ChartTypeTemplate.hxx +++ b/chart2/source/model/template/ChartTypeTemplate.hxx @@ -82,46 +82,36 @@ protected: // ____ XChartTypeTemplate ____ virtual css::uno::Reference< css::chart2::XDiagram > SAL_CALL createDiagramByDataSource( const css::uno::Reference< css::chart2::data::XDataSource >& xDataSource, - const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) override; /// denotes if the chart needs categories at the first scale - virtual sal_Bool SAL_CALL supportsCategories() - throw (css::uno::RuntimeException, ::std::exception) override; + virtual sal_Bool SAL_CALL supportsCategories() override; virtual void SAL_CALL changeDiagram( - const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) override; virtual void SAL_CALL changeDiagramData( const css::uno::Reference< css::chart2::XDiagram >& xDiagram, const css::uno::Reference< css::chart2::data::XDataSource >& xDataSource, - const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& aArguments ) override; virtual sal_Bool SAL_CALL matchesTemplate( const css::uno::Reference< css::chart2::XDiagram >& xDiagram, - sal_Bool bAdaptProperties ) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool bAdaptProperties ) override; // still abstract: getChartTypeForNewSeries() - virtual css::uno::Reference< css::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() override; virtual void SAL_CALL applyStyle( const css::uno::Reference< css::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, - ::sal_Int32 nSeriesCount ) - throw (css::uno::RuntimeException, std::exception) override; + ::sal_Int32 nSeriesCount ) override; virtual void SAL_CALL resetStyles( - const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) override; /// @throws css::uno::RuntimeException void SAL_CALL applyStyles( - const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) - throw (css::uno::RuntimeException); + const css::uno::Reference< css::chart2::XDiagram >& xDiagram ); // ____ XServiceName ____ - virtual OUString SAL_CALL getServiceName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; // Methods to override for automatic creation diff --git a/chart2/source/model/template/ColumnChartType.cxx b/chart2/source/model/template/ColumnChartType.cxx index 3b6f23cca403..84c6054badbd 100644 --- a/chart2/source/model/template/ColumnChartType.cxx +++ b/chart2/source/model/template/ColumnChartType.cxx @@ -140,20 +140,17 @@ ColumnChartType::~ColumnChartType() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL ColumnChartType::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new ColumnChartType( *this )); } // ____ XChartType ____ OUString SAL_CALL ColumnChartType::getChartType() - throw (uno::RuntimeException, std::exception) { return OUString(CHART2_SERVICE_NAME_CHARTTYPE_COLUMN); } uno::Sequence< OUString > ColumnChartType::getSupportedPropertyRoles() - throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aPropRoles(2); aPropRoles[0] = "FillColor"; @@ -164,7 +161,6 @@ uno::Sequence< OUString > ColumnChartType::getSupportedPropertyRoles() // ____ OPropertySet ____ uno::Any ColumnChartType::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticColumnChartTypeDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -180,25 +176,21 @@ uno::Any ColumnChartType::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL ColumnChartType::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticColumnChartTypeInfo::get(); } OUString SAL_CALL ColumnChartType::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.ColumnChartType"); } sal_Bool SAL_CALL ColumnChartType::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL ColumnChartType::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CHART2_SERVICE_NAME_CHARTTYPE_COLUMN, diff --git a/chart2/source/model/template/ColumnChartType.hxx b/chart2/source/model/template/ColumnChartType.hxx index f37f845c7ee4..5f2aaea15b14 100644 --- a/chart2/source/model/template/ColumnChartType.hxx +++ b/chart2/source/model/template/ColumnChartType.hxx @@ -31,38 +31,30 @@ public: virtual ~ColumnChartType() override; virtual OUString SAL_CALL - getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; + supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; protected: explicit ColumnChartType( const ColumnChartType & rOther ); // ____ XChartType ____ - virtual OUString SAL_CALL getChartType() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getChartType() override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedPropertyRoles() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedPropertyRoles() override; // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; }; } // namespace chart diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx index 4868df4d4754..9809cd0f0845 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.cxx @@ -135,7 +135,6 @@ ColumnLineChartTypeTemplate::~ColumnLineChartTypeTemplate() // ____ OPropertySet ____ uno::Any ColumnLineChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticColumnLineChartTypeTemplateDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -151,7 +150,6 @@ uno::Any ColumnLineChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL ColumnLineChartTypeTemplate::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticColumnLineChartTypeTemplateInfo::get(); } @@ -239,7 +237,6 @@ void SAL_CALL ColumnLineChartTypeTemplate::applyStyle( ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (uno::RuntimeException, std::exception) { ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); @@ -270,7 +267,6 @@ StackMode ColumnLineChartTypeTemplate::getStackMode( sal_Int32 nChartTypeIndex ) sal_Bool SAL_CALL ColumnLineChartTypeTemplate::matchesTemplate( const uno::Reference< XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (uno::RuntimeException, std::exception) { bool bResult = false; @@ -367,7 +363,6 @@ Reference< chart2::XChartType > ColumnLineChartTypeTemplate::getChartTypeForInde Reference< XChartType > SAL_CALL ColumnLineChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (uno::RuntimeException, std::exception) { Reference< chart2::XChartType > xResult; @@ -388,7 +383,6 @@ Reference< XChartType > SAL_CALL ColumnLineChartTypeTemplate::getChartTypeForNew } Reference< XDataInterpreter > SAL_CALL ColumnLineChartTypeTemplate::getDataInterpreter() - throw (uno::RuntimeException, std::exception) { if( ! m_xDataInterpreter.is()) { diff --git a/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx b/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx index 80a15444d598..8dcd13461fa6 100644 --- a/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx +++ b/chart2/source/model/template/ColumnLineChartTypeTemplate.hxx @@ -49,32 +49,26 @@ public: protected: // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL matchesTemplate( const css::uno::Reference< css::chart2::XDiagram >& xDiagram, - sal_Bool bAdaptProperties ) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool bAdaptProperties ) override; virtual css::uno::Reference< css::chart2::XChartType > SAL_CALL getChartTypeForNewSeries( const css::uno::Sequence< - css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) override; virtual void SAL_CALL applyStyle( const css::uno::Reference< css::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, - ::sal_Int32 nSeriesCount ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() - throw (css::uno::RuntimeException, std::exception) override; + ::sal_Int32 nSeriesCount ) override; + virtual css::uno::Reference< css::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() override; // ____ ChartTypeTemplate ____ virtual void createChartTypes( diff --git a/chart2/source/model/template/ColumnLineDataInterpreter.cxx b/chart2/source/model/template/ColumnLineDataInterpreter.cxx index 3f41a7016664..735ca0ba976d 100644 --- a/chart2/source/model/template/ColumnLineDataInterpreter.cxx +++ b/chart2/source/model/template/ColumnLineDataInterpreter.cxx @@ -54,7 +54,6 @@ InterpretedData SAL_CALL ColumnLineDataInterpreter::interpretDataSource( const Reference< data::XDataSource >& xSource, const Sequence< beans::PropertyValue >& aArguments, const Sequence< Reference< XDataSeries > >& aSeriesToReUse ) - throw (uno::RuntimeException, std::exception) { InterpretedData aResult( DataInterpreter::interpretDataSource( xSource, aArguments, aSeriesToReUse )); diff --git a/chart2/source/model/template/ColumnLineDataInterpreter.hxx b/chart2/source/model/template/ColumnLineDataInterpreter.hxx index 5d113be6b029..e6956db4cd30 100644 --- a/chart2/source/model/template/ColumnLineDataInterpreter.hxx +++ b/chart2/source/model/template/ColumnLineDataInterpreter.hxx @@ -36,8 +36,7 @@ protected: virtual css::chart2::InterpretedData SAL_CALL interpretDataSource( const css::uno::Reference< css::chart2::data::XDataSource >& xSource, const css::uno::Sequence< css::beans::PropertyValue >& aArguments, - const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aSeriesToReUse ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aSeriesToReUse ) override; private: sal_Int32 m_nNumberOfLines; diff --git a/chart2/source/model/template/DataInterpreter.cxx b/chart2/source/model/template/DataInterpreter.cxx index 052fe51ae75d..d3e7c85f5352 100644 --- a/chart2/source/model/template/DataInterpreter.cxx +++ b/chart2/source/model/template/DataInterpreter.cxx @@ -59,7 +59,6 @@ InterpretedData SAL_CALL DataInterpreter::interpretDataSource( const Reference< data::XDataSource >& xSource, const Sequence< beans::PropertyValue >& aArguments, const Sequence< Reference< XDataSeries > >& aSeriesToReUse ) - throw (uno::RuntimeException, std::exception) { if( ! xSource.is()) return InterpretedData(); @@ -134,7 +133,6 @@ InterpretedData SAL_CALL DataInterpreter::interpretDataSource( InterpretedData SAL_CALL DataInterpreter::reinterpretDataSeries( const InterpretedData& aInterpretedData ) - throw (uno::RuntimeException, std::exception) { InterpretedData aResult( aInterpretedData ); @@ -191,7 +189,6 @@ InterpretedData SAL_CALL DataInterpreter::reinterpretDataSeries( // criterion: all series must have exactly one data::XLabeledDataSequence sal_Bool SAL_CALL DataInterpreter::isDataCompatible( const chart2::InterpretedData& aInterpretedData ) - throw (uno::RuntimeException, std::exception) { Sequence< Reference< XDataSeries > > aSeries( FlattenSequence( aInterpretedData.Series )); for( sal_Int32 i=0; i SAL_CALL DataInterpreter::mergeInterpretedData( const InterpretedData& aInterpretedData ) - throw (uno::RuntimeException, std::exception) { vector< Reference< data::XLabeledDataSequence > > aResultVec; aResultVec.reserve( aInterpretedData.Series.getLength() + @@ -378,19 +374,16 @@ bool DataInterpreter::UseCategoriesAsX( const Sequence< beans::PropertyValue > & } OUString SAL_CALL DataInterpreter::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart2.DataInterpreter"); } sal_Bool SAL_CALL DataInterpreter::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL DataInterpreter::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart2.DataInterpreter" }; } diff --git a/chart2/source/model/template/DataInterpreter.hxx b/chart2/source/model/template/DataInterpreter.hxx index 15bd9589c3f2..5306146a6b34 100644 --- a/chart2/source/model/template/DataInterpreter.hxx +++ b/chart2/source/model/template/DataInterpreter.hxx @@ -36,12 +36,9 @@ public: virtual ~DataInterpreter() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // convenience methods static OUString GetRole( const css::uno::Reference< css::chart2::data::XDataSequence > & xSeq ); @@ -66,17 +63,13 @@ protected: virtual css::chart2::InterpretedData SAL_CALL interpretDataSource( const css::uno::Reference< css::chart2::data::XDataSource >& xSource, const css::uno::Sequence< css::beans::PropertyValue >& aArguments, - const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aSeriesToReUse ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aSeriesToReUse ) override; virtual css::chart2::InterpretedData SAL_CALL reinterpretDataSeries( - const css::chart2::InterpretedData& aInterpretedData ) - throw (css::uno::RuntimeException, std::exception) override; + const css::chart2::InterpretedData& aInterpretedData ) override; virtual sal_Bool SAL_CALL isDataCompatible( - const css::chart2::InterpretedData& aInterpretedData ) - throw (css::uno::RuntimeException, std::exception) override; + const css::chart2::InterpretedData& aInterpretedData ) override; virtual css::uno::Reference< css::chart2::data::XDataSource > SAL_CALL mergeInterpretedData( - const css::chart2::InterpretedData& aInterpretedData ) - throw (css::uno::RuntimeException, std::exception) override; + const css::chart2::InterpretedData& aInterpretedData ) override; }; } // namespace chart diff --git a/chart2/source/model/template/FilledNetChartType.cxx b/chart2/source/model/template/FilledNetChartType.cxx index 661805a4a474..39e7b2f34c11 100644 --- a/chart2/source/model/template/FilledNetChartType.cxx +++ b/chart2/source/model/template/FilledNetChartType.cxx @@ -50,32 +50,27 @@ FilledNetChartType::~FilledNetChartType() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL FilledNetChartType::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new FilledNetChartType( *this )); } // ____ XChartType ____ OUString SAL_CALL FilledNetChartType::getChartType() - throw (uno::RuntimeException, std::exception) { return OUString(CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET); } OUString SAL_CALL FilledNetChartType::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.FilledNetChartType"); } sal_Bool SAL_CALL FilledNetChartType::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL FilledNetChartType::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET, diff --git a/chart2/source/model/template/FilledNetChartType.hxx b/chart2/source/model/template/FilledNetChartType.hxx index e308258426ae..49fc980d1078 100644 --- a/chart2/source/model/template/FilledNetChartType.hxx +++ b/chart2/source/model/template/FilledNetChartType.hxx @@ -31,25 +31,20 @@ public: virtual ~FilledNetChartType() override; virtual OUString SAL_CALL - getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; + supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; protected: explicit FilledNetChartType( const FilledNetChartType & rOther ); // ____ XChartType ____ - virtual OUString SAL_CALL getChartType() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getChartType() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; }; } // namespace chart diff --git a/chart2/source/model/template/GL3DBarChartType.cxx b/chart2/source/model/template/GL3DBarChartType.cxx index f18c9c941b23..0e45c8d8d6fe 100644 --- a/chart2/source/model/template/GL3DBarChartType.cxx +++ b/chart2/source/model/template/GL3DBarChartType.cxx @@ -102,19 +102,16 @@ GL3DBarChartType::GL3DBarChartType( const GL3DBarChartType& rOther ) : GL3DBarChartType::~GL3DBarChartType() {} OUString SAL_CALL GL3DBarChartType::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.GL3DBarChartType"); } sal_Bool SAL_CALL GL3DBarChartType::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL GL3DBarChartType::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CHART2_SERVICE_NAME_CHARTTYPE_GL3DBAR, @@ -123,13 +120,11 @@ css::uno::Sequence< OUString > SAL_CALL GL3DBarChartType::getSupportedServiceNam } OUString SAL_CALL GL3DBarChartType::getChartType() - throw (css::uno::RuntimeException, std::exception) { return OUString(CHART2_SERVICE_NAME_CHARTTYPE_GL3DBAR); } uno::Sequence GL3DBarChartType::getSupportedPropertyRoles() - throw (css::uno::RuntimeException, std::exception) { uno::Sequence< OUString > aPropRoles { "FillColor" }; @@ -138,13 +133,11 @@ uno::Sequence GL3DBarChartType::getSupportedPropertyRoles() css::uno::Reference GL3DBarChartType::createClone() - throw (css::uno::RuntimeException, std::exception) { return uno::Reference(new GL3DBarChartType(*this)); } css::uno::Any GL3DBarChartType::GetDefaultValue( sal_Int32 nHandle ) const - throw (css::beans::UnknownPropertyException) { const tPropertyValueMap& rDefaults = *Defaults::get(); tPropertyValueMap::const_iterator it = rDefaults.find(nHandle); @@ -157,7 +150,6 @@ cppu::IPropertyArrayHelper& GL3DBarChartType::getInfoHelper() } css::uno::Reference GL3DBarChartType::getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) { return *ChartTypeInfo::get(); } diff --git a/chart2/source/model/template/GL3DBarChartType.hxx b/chart2/source/model/template/GL3DBarChartType.hxx index 939b9819516c..75a156988507 100644 --- a/chart2/source/model/template/GL3DBarChartType.hxx +++ b/chart2/source/model/template/GL3DBarChartType.hxx @@ -25,38 +25,30 @@ public: virtual ~GL3DBarChartType() override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedPropertyRoles() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedPropertyRoles() override; virtual OUString SAL_CALL - getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; + supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; protected: GL3DBarChartType( const GL3DBarChartType& rOther ); - virtual OUString SAL_CALL getChartType() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getChartType() override; virtual css::uno::Reference SAL_CALL - createClone() - throw (css::uno::RuntimeException, std::exception) override; + createClone() override; // OPropertySet - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw (css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; virtual cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // XPropertySet virtual css::uno::Reference SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; }; } diff --git a/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx b/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx index 51ccde36f3e9..c8cf9b490efa 100644 --- a/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx +++ b/chart2/source/model/template/GL3DBarChartTypeTemplate.cxx @@ -128,7 +128,6 @@ uno::Reference GL3DBarChartTypeTemplate::getChartTypeForInde sal_Bool SAL_CALL GL3DBarChartTypeTemplate::matchesTemplate( const css::uno::Reference& xDiagram, sal_Bool bAdaptProperties ) - throw (css::uno::RuntimeException, std::exception) { bool bResult = ChartTypeTemplate::matchesTemplate(xDiagram, bAdaptProperties); @@ -148,7 +147,6 @@ sal_Bool SAL_CALL GL3DBarChartTypeTemplate::matchesTemplate( uno::Reference GL3DBarChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence >& /*xOldChartTypes*/ ) - throw (css::uno::RuntimeException, ::std::exception) { uno::Reference xResult; @@ -170,13 +168,11 @@ GL3DBarChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence GL3DBarChartTypeTemplate::getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) { return *ChartTypeInfo::get(); } diff --git a/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx b/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx index baa781459d1a..6db19deb9989 100644 --- a/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx +++ b/chart2/source/model/template/GL3DBarChartTypeTemplate.hxx @@ -38,26 +38,21 @@ public: virtual sal_Bool SAL_CALL matchesTemplate( const css::uno::Reference& xDiagram, - sal_Bool bAdaptProperties ) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool bAdaptProperties ) override; virtual css::uno::Reference SAL_CALL - getChartTypeForNewSeries( const css::uno::Sequence >& xOldChartTypes ) - throw (css::uno::RuntimeException, ::std::exception) override; + getChartTypeForNewSeries( const css::uno::Sequence >& xOldChartTypes ) override; - virtual sal_Bool SAL_CALL supportsCategories() - throw (css::uno::RuntimeException, ::std::exception) override; + virtual sal_Bool SAL_CALL supportsCategories() override; // OPropertySet - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw (css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; virtual cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // XPropertySet virtual css::uno::Reference SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; }; } diff --git a/chart2/source/model/template/LineChartType.cxx b/chart2/source/model/template/LineChartType.cxx index db1a2bd2f748..c1af371763c5 100644 --- a/chart2/source/model/template/LineChartType.cxx +++ b/chart2/source/model/template/LineChartType.cxx @@ -151,21 +151,18 @@ LineChartType::~LineChartType() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL LineChartType::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new LineChartType( *this )); } // ____ XChartType ____ OUString SAL_CALL LineChartType::getChartType() - throw (uno::RuntimeException, std::exception) { return OUString(CHART2_SERVICE_NAME_CHARTTYPE_LINE); } // ____ OPropertySet ____ uno::Any LineChartType::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticLineChartTypeDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -181,25 +178,21 @@ uno::Any LineChartType::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL LineChartType::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticLineChartTypeInfo::get(); } OUString SAL_CALL LineChartType::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.LineChartType"); } sal_Bool SAL_CALL LineChartType::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL LineChartType::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CHART2_SERVICE_NAME_CHARTTYPE_LINE, diff --git a/chart2/source/model/template/LineChartType.hxx b/chart2/source/model/template/LineChartType.hxx index fa7e2b405d4a..d001b72bf424 100644 --- a/chart2/source/model/template/LineChartType.hxx +++ b/chart2/source/model/template/LineChartType.hxx @@ -32,35 +32,28 @@ public: virtual ~LineChartType() override; virtual OUString SAL_CALL - getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; + supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; protected: explicit LineChartType( const LineChartType & rOther ); // ____ XChartType ____ - virtual OUString SAL_CALL getChartType() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getChartType() override; // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; }; } // namespace chart diff --git a/chart2/source/model/template/LineChartTypeTemplate.cxx b/chart2/source/model/template/LineChartTypeTemplate.cxx index 8c988c529190..759a5aa7fe86 100644 --- a/chart2/source/model/template/LineChartTypeTemplate.cxx +++ b/chart2/source/model/template/LineChartTypeTemplate.cxx @@ -164,7 +164,6 @@ LineChartTypeTemplate::~LineChartTypeTemplate() {} // ____ OPropertySet ____ uno::Any LineChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticLineChartTypeTemplateDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -180,7 +179,6 @@ uno::Any LineChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL LineChartTypeTemplate::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticLineChartTypeTemplateInfo::get(); } @@ -199,7 +197,6 @@ StackMode LineChartTypeTemplate::getStackMode( sal_Int32 /* nChartTypeIndex */ ) sal_Bool SAL_CALL LineChartTypeTemplate::matchesTemplate( const uno::Reference< chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (uno::RuntimeException, std::exception) { bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties ); @@ -317,7 +314,6 @@ Reference< chart2::XChartType > LineChartTypeTemplate::getChartTypeForIndex( sal Reference< chart2::XChartType > SAL_CALL LineChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (uno::RuntimeException, std::exception) { Reference< chart2::XChartType > xResult; @@ -354,7 +350,6 @@ void SAL_CALL LineChartTypeTemplate::applyStyle( ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (uno::RuntimeException, std::exception) { ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); diff --git a/chart2/source/model/template/LineChartTypeTemplate.hxx b/chart2/source/model/template/LineChartTypeTemplate.hxx index 1a1364bfb8f2..55fc7797ec87 100644 --- a/chart2/source/model/template/LineChartTypeTemplate.hxx +++ b/chart2/source/model/template/LineChartTypeTemplate.hxx @@ -51,29 +51,24 @@ public: protected: // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL matchesTemplate( const css::uno::Reference< css::chart2::XDiagram >& xDiagram, - sal_Bool bAdaptProperties ) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool bAdaptProperties ) override; virtual css::uno::Reference< css::chart2::XChartType > SAL_CALL - getChartTypeForNewSeries( const css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (css::uno::RuntimeException, std::exception) override; + getChartTypeForNewSeries( const css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) override; virtual void SAL_CALL applyStyle( const css::uno::Reference< css::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, - ::sal_Int32 nSeriesCount ) - throw (css::uno::RuntimeException, std::exception) override; + ::sal_Int32 nSeriesCount ) override; // ____ ChartTypeTemplate ____ virtual css::uno::Reference< css::chart2::XChartType > diff --git a/chart2/source/model/template/NetChartType.cxx b/chart2/source/model/template/NetChartType.cxx index b079b87e7360..c3310f297f3b 100644 --- a/chart2/source/model/template/NetChartType.cxx +++ b/chart2/source/model/template/NetChartType.cxx @@ -54,8 +54,6 @@ NetChartType_Base::~NetChartType_Base() Reference< XCoordinateSystem > SAL_CALL NetChartType_Base::createCoordinateSystem( ::sal_Int32 DimensionCount ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { if( DimensionCount != 2 ) throw lang::IllegalArgumentException( @@ -89,7 +87,6 @@ Reference< XCoordinateSystem > SAL_CALL // ____ OPropertySet ____ uno::Any NetChartType_Base::GetDefaultValue( sal_Int32 /*nHandle*/ ) const - throw(beans::UnknownPropertyException) { return uno::Any(); } @@ -134,7 +131,6 @@ struct StaticNetChartTypeInfo : public rtl::StaticAggregate< uno::Reference< bea // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL NetChartType_Base::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticNetChartTypeInfo::get(); } @@ -154,32 +150,27 @@ NetChartType::~NetChartType() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL NetChartType::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new NetChartType( *this )); } // ____ XChartType ____ OUString SAL_CALL NetChartType::getChartType() - throw (uno::RuntimeException, std::exception) { return OUString(CHART2_SERVICE_NAME_CHARTTYPE_NET); } OUString SAL_CALL NetChartType::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.NetChartType"); } sal_Bool SAL_CALL NetChartType::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL NetChartType::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CHART2_SERVICE_NAME_CHARTTYPE_NET, diff --git a/chart2/source/model/template/NetChartType.hxx b/chart2/source/model/template/NetChartType.hxx index b12a4cc3e78c..61a5d4fa184c 100644 --- a/chart2/source/model/template/NetChartType.hxx +++ b/chart2/source/model/template/NetChartType.hxx @@ -35,20 +35,16 @@ protected: // ____ XChartType ____ virtual css::uno::Reference< css::chart2::XCoordinateSystem > SAL_CALL - createCoordinateSystem( ::sal_Int32 DimensionCount ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + createCoordinateSystem( ::sal_Int32 DimensionCount ) override; // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; }; class NetChartType : public NetChartType_Base @@ -58,25 +54,20 @@ public: virtual ~NetChartType() override; virtual OUString SAL_CALL - getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; + supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; protected: explicit NetChartType( const NetChartType & rOther ); // ____ XChartType ____ - virtual OUString SAL_CALL getChartType() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getChartType() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; }; } // namespace chart diff --git a/chart2/source/model/template/NetChartTypeTemplate.cxx b/chart2/source/model/template/NetChartTypeTemplate.cxx index 0b06f66c1b1f..a12dccf3a574 100644 --- a/chart2/source/model/template/NetChartTypeTemplate.cxx +++ b/chart2/source/model/template/NetChartTypeTemplate.cxx @@ -62,7 +62,6 @@ void SAL_CALL NetChartTypeTemplate::applyStyle( ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (uno::RuntimeException, std::exception) { ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); @@ -84,7 +83,6 @@ void SAL_CALL NetChartTypeTemplate::applyStyle( sal_Bool SAL_CALL NetChartTypeTemplate::matchesTemplate( const Reference< chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (uno::RuntimeException, std::exception) { bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties ); @@ -185,7 +183,6 @@ Reference< chart2::XChartType > NetChartTypeTemplate::getChartTypeForIndex( sal_ Reference< chart2::XChartType > SAL_CALL NetChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (uno::RuntimeException, std::exception) { Reference< chart2::XChartType > xResult( getChartTypeForIndex( 0 ) ); ChartTypeTemplate::copyPropertiesFromOldToNewCoordinateSystem( aFormerlyUsedChartTypes, xResult ); diff --git a/chart2/source/model/template/NetChartTypeTemplate.hxx b/chart2/source/model/template/NetChartTypeTemplate.hxx index f6eca07f400b..8ba47c2f9905 100644 --- a/chart2/source/model/template/NetChartTypeTemplate.hxx +++ b/chart2/source/model/template/NetChartTypeTemplate.hxx @@ -42,17 +42,14 @@ protected: // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL matchesTemplate( const css::uno::Reference< css::chart2::XDiagram >& xDiagram, - sal_Bool bAdaptProperties ) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool bAdaptProperties ) override; virtual css::uno::Reference< css::chart2::XChartType > SAL_CALL - getChartTypeForNewSeries( const css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (css::uno::RuntimeException, std::exception) override; + getChartTypeForNewSeries( const css::uno::Sequence< css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) override; virtual void SAL_CALL applyStyle( const css::uno::Reference< css::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, - ::sal_Int32 nSeriesCount ) - throw (css::uno::RuntimeException, std::exception) override; + ::sal_Int32 nSeriesCount ) override; // ____ ChartTypeTemplate ____ virtual css::uno::Reference< css::chart2::XChartType > diff --git a/chart2/source/model/template/PieChartType.cxx b/chart2/source/model/template/PieChartType.cxx index 70badb000b23..c758d67353ad 100644 --- a/chart2/source/model/template/PieChartType.cxx +++ b/chart2/source/model/template/PieChartType.cxx @@ -140,22 +140,18 @@ PieChartType::~PieChartType() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL PieChartType::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new PieChartType( *this )); } // ____ XChartType ____ OUString SAL_CALL PieChartType::getChartType() - throw (uno::RuntimeException, std::exception) { return OUString(CHART2_SERVICE_NAME_CHARTTYPE_PIE); } Reference< chart2::XCoordinateSystem > SAL_CALL PieChartType::createCoordinateSystem( ::sal_Int32 DimensionCount ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { Reference< chart2::XCoordinateSystem > xResult( new PolarCoordinateSystem( GetComponentContext(), DimensionCount )); @@ -190,7 +186,6 @@ Reference< chart2::XCoordinateSystem > SAL_CALL } uno::Sequence< OUString > PieChartType::getSupportedPropertyRoles() - throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aPropRoles(2); aPropRoles[0] = "FillColor"; @@ -201,7 +196,6 @@ uno::Sequence< OUString > PieChartType::getSupportedPropertyRoles() // ____ OPropertySet ____ uno::Any PieChartType::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticPieChartTypeDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -218,25 +212,21 @@ uno::Any PieChartType::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL PieChartType::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticPieChartTypeInfo::get(); } OUString SAL_CALL PieChartType::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.PieChartType"); } sal_Bool SAL_CALL PieChartType::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL PieChartType::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CHART2_SERVICE_NAME_CHARTTYPE_PIE, diff --git a/chart2/source/model/template/PieChartType.hxx b/chart2/source/model/template/PieChartType.hxx index f67987073cba..86509405b313 100644 --- a/chart2/source/model/template/PieChartType.hxx +++ b/chart2/source/model/template/PieChartType.hxx @@ -32,44 +32,34 @@ public: virtual ~PieChartType() override; virtual OUString SAL_CALL - getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; + supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; protected: explicit PieChartType( const PieChartType & rOther ); // ____ XChartType ____ - virtual OUString SAL_CALL getChartType() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getChartType() override; virtual css::uno::Reference< css::chart2::XCoordinateSystem > SAL_CALL - createCoordinateSystem( ::sal_Int32 DimensionCount ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + createCoordinateSystem( ::sal_Int32 DimensionCount ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedPropertyRoles() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedPropertyRoles() override; // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; // ____ OPropertySet ____ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; }; } // namespace chart diff --git a/chart2/source/model/template/PieChartTypeTemplate.cxx b/chart2/source/model/template/PieChartTypeTemplate.cxx index cd296affe968..0144b54a6924 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.cxx +++ b/chart2/source/model/template/PieChartTypeTemplate.cxx @@ -170,7 +170,6 @@ PieChartTypeTemplate::~PieChartTypeTemplate() // ____ OPropertySet ____ uno::Any PieChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticPieChartTypeTemplateDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -186,7 +185,6 @@ uno::Any PieChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL PieChartTypeTemplate::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticPieChartTypeTemplateInfo::get(); } @@ -306,7 +304,6 @@ void PieChartTypeTemplate::createChartTypes( sal_Bool SAL_CALL PieChartTypeTemplate::matchesTemplate( const uno::Reference< chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (uno::RuntimeException, std::exception) { bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties ); @@ -417,7 +414,6 @@ Reference< chart2::XChartType > PieChartTypeTemplate::getChartTypeForIndex( sal_ Reference< chart2::XChartType > SAL_CALL PieChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (uno::RuntimeException, std::exception) { Reference< chart2::XChartType > xResult; @@ -449,7 +445,6 @@ void SAL_CALL PieChartTypeTemplate::applyStyle( ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (uno::RuntimeException, std::exception) { ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); @@ -536,7 +531,6 @@ void SAL_CALL PieChartTypeTemplate::applyStyle( } void SAL_CALL PieChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram >& xDiagram ) - throw (uno::RuntimeException, std::exception) { // reset axes and grids Reference< chart2::XCoordinateSystemContainer > xCooSysCnt( xDiagram, uno::UNO_QUERY ); diff --git a/chart2/source/model/template/PieChartTypeTemplate.hxx b/chart2/source/model/template/PieChartTypeTemplate.hxx index 5940ba610b2a..640ba6c20b7e 100644 --- a/chart2/source/model/template/PieChartTypeTemplate.hxx +++ b/chart2/source/model/template/PieChartTypeTemplate.hxx @@ -50,33 +50,27 @@ public: protected: // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL matchesTemplate( const css::uno::Reference< css::chart2::XDiagram >& xDiagram, - sal_Bool bAdaptProperties ) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool bAdaptProperties ) override; virtual css::uno::Reference< css::chart2::XChartType > SAL_CALL getChartTypeForNewSeries( const css::uno::Sequence< - css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) override; virtual void SAL_CALL applyStyle( const css::uno::Reference< css::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, - ::sal_Int32 nSeriesCount ) - throw (css::uno::RuntimeException, std::exception) override; + ::sal_Int32 nSeriesCount ) override; virtual void SAL_CALL resetStyles( - const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) override; // ____ ChartTypeTemplate ____ virtual sal_Int32 getDimension() const override; diff --git a/chart2/source/model/template/ScatterChartType.cxx b/chart2/source/model/template/ScatterChartType.cxx index f178d5383ebb..922dfb90f26f 100644 --- a/chart2/source/model/template/ScatterChartType.cxx +++ b/chart2/source/model/template/ScatterChartType.cxx @@ -168,7 +168,6 @@ ScatterChartType::~ScatterChartType() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL ScatterChartType::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new ScatterChartType( *this )); } @@ -176,8 +175,6 @@ uno::Reference< util::XCloneable > SAL_CALL ScatterChartType::createClone() // ____ XChartType ____ Reference< chart2::XCoordinateSystem > SAL_CALL ScatterChartType::createCoordinateSystem( ::sal_Int32 DimensionCount ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { Reference< chart2::XCoordinateSystem > xResult( new CartesianCoordinateSystem( GetComponentContext(), DimensionCount )); @@ -207,13 +204,11 @@ Reference< chart2::XCoordinateSystem > SAL_CALL } OUString SAL_CALL ScatterChartType::getChartType() - throw (uno::RuntimeException, std::exception) { return OUString(CHART2_SERVICE_NAME_CHARTTYPE_SCATTER); } uno::Sequence< OUString > SAL_CALL ScatterChartType::getSupportedMandatoryRoles() - throw (uno::RuntimeException, std::exception) { uno::Sequence< OUString > aMandRolesSeq(3); aMandRolesSeq[0] = "label"; @@ -224,7 +219,6 @@ uno::Sequence< OUString > SAL_CALL ScatterChartType::getSupportedMandatoryRoles( // ____ OPropertySet ____ uno::Any ScatterChartType::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticScatterChartTypeDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -241,25 +235,21 @@ uno::Any ScatterChartType::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL ScatterChartType::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticScatterChartTypeInfo::get(); } OUString SAL_CALL ScatterChartType::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.ScatterChartType"); } sal_Bool SAL_CALL ScatterChartType::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL ScatterChartType::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CHART2_SERVICE_NAME_CHARTTYPE_SCATTER, diff --git a/chart2/source/model/template/ScatterChartType.hxx b/chart2/source/model/template/ScatterChartType.hxx index 64ea32e308aa..a09a840224ab 100644 --- a/chart2/source/model/template/ScatterChartType.hxx +++ b/chart2/source/model/template/ScatterChartType.hxx @@ -36,44 +36,34 @@ public: virtual ~ScatterChartType() override; virtual OUString SAL_CALL - getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; + getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; + supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + getSupportedServiceNames() override; protected: explicit ScatterChartType( const ScatterChartType & rOther ); // ____ XChartType ____ - virtual OUString SAL_CALL getChartType() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getChartType() override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedMandatoryRoles() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedMandatoryRoles() override; virtual css::uno::Reference< css::chart2::XCoordinateSystem > SAL_CALL - createCoordinateSystem( ::sal_Int32 DimensionCount ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + createCoordinateSystem( ::sal_Int32 DimensionCount ) override; // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; // ____ OPropertySet ____ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; }; } // namespace chart diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.cxx b/chart2/source/model/template/ScatterChartTypeTemplate.cxx index 3f98f72fa2c7..bde601008446 100644 --- a/chart2/source/model/template/ScatterChartTypeTemplate.cxx +++ b/chart2/source/model/template/ScatterChartTypeTemplate.cxx @@ -165,7 +165,6 @@ ScatterChartTypeTemplate::~ScatterChartTypeTemplate() // ____ OPropertySet ____ uno::Any ScatterChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticScatterChartTypeTemplateDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -181,7 +180,6 @@ uno::Any ScatterChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL ScatterChartTypeTemplate::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticScatterChartTypeTemplateInfo::get(); } @@ -203,7 +201,6 @@ void SAL_CALL ScatterChartTypeTemplate::applyStyle( ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (uno::RuntimeException, std::exception) { ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); @@ -225,7 +222,6 @@ void SAL_CALL ScatterChartTypeTemplate::applyStyle( // ____ XChartTypeTemplate ____ sal_Bool SAL_CALL ScatterChartTypeTemplate::supportsCategories() - throw (uno::RuntimeException, std::exception) { return false; } @@ -233,7 +229,6 @@ sal_Bool SAL_CALL ScatterChartTypeTemplate::supportsCategories() sal_Bool SAL_CALL ScatterChartTypeTemplate::matchesTemplate( const Reference< chart2::XDiagram >& xDiagram, sal_Bool bAdaptProperties ) - throw (uno::RuntimeException, std::exception) { bool bResult = ChartTypeTemplate::matchesTemplate( xDiagram, bAdaptProperties ); @@ -351,7 +346,6 @@ Reference< chart2::XChartType > ScatterChartTypeTemplate::getChartTypeForIndex( Reference< chart2::XChartType > SAL_CALL ScatterChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (uno::RuntimeException, std::exception) { Reference< chart2::XChartType > xResult; @@ -384,7 +378,6 @@ Reference< chart2::XChartType > SAL_CALL ScatterChartTypeTemplate::getChartTypeF } Reference< chart2::XDataInterpreter > SAL_CALL ScatterChartTypeTemplate::getDataInterpreter() - throw (uno::RuntimeException, std::exception) { if( ! m_xDataInterpreter.is()) m_xDataInterpreter.set( new XYDataInterpreter ); diff --git a/chart2/source/model/template/ScatterChartTypeTemplate.hxx b/chart2/source/model/template/ScatterChartTypeTemplate.hxx index 65ae965bc284..18829d0ea5da 100644 --- a/chart2/source/model/template/ScatterChartTypeTemplate.hxx +++ b/chart2/source/model/template/ScatterChartTypeTemplate.hxx @@ -49,34 +49,27 @@ public: protected: // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XChartTypeTemplate ____ - virtual sal_Bool SAL_CALL supportsCategories() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsCategories() override; virtual sal_Bool SAL_CALL matchesTemplate( const css::uno::Reference< css::chart2::XDiagram >& xDiagram, - sal_Bool bAdaptProperties ) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool bAdaptProperties ) override; virtual css::uno::Reference< css::chart2::XChartType > SAL_CALL getChartTypeForNewSeries( const css::uno::Sequence< - css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::chart2::XChartType > >& aFormerlyUsedChartTypes ) override; + virtual css::uno::Reference< css::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() override; virtual void SAL_CALL applyStyle( const css::uno::Reference< css::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeGroupIndex, ::sal_Int32 nSeriesIndex, - ::sal_Int32 nSeriesCount ) - throw (css::uno::RuntimeException, std::exception) override; + ::sal_Int32 nSeriesCount ) override; // ____ ChartTypeTemplate ____ virtual css::uno::Reference< css::chart2::XChartType > diff --git a/chart2/source/model/template/StockChartTypeTemplate.cxx b/chart2/source/model/template/StockChartTypeTemplate.cxx index aa4d41b48673..3b58a76aa969 100644 --- a/chart2/source/model/template/StockChartTypeTemplate.cxx +++ b/chart2/source/model/template/StockChartTypeTemplate.cxx @@ -178,7 +178,6 @@ StockChartTypeTemplate::~StockChartTypeTemplate() {} // ____ OPropertySet ____ uno::Any StockChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticStockChartTypeTemplateDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -194,7 +193,6 @@ uno::Any StockChartTypeTemplate::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL StockChartTypeTemplate::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticStockChartTypeTemplateInfo::get(); } @@ -220,7 +218,6 @@ void SAL_CALL StockChartTypeTemplate::applyStyle( ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, ::sal_Int32 nSeriesCount ) - throw (uno::RuntimeException, std::exception) { ChartTypeTemplate::applyStyle( xSeries, nChartTypeIndex, nSeriesIndex, nSeriesCount ); try @@ -265,7 +262,6 @@ void SAL_CALL StockChartTypeTemplate::applyStyle( void SAL_CALL StockChartTypeTemplate::resetStyles( const Reference< chart2::XDiagram >& xDiagram ) - throw (uno::RuntimeException, std::exception) { ChartTypeTemplate::resetStyles( xDiagram ); if( getDimension() == 3 ) @@ -403,7 +399,6 @@ void StockChartTypeTemplate::createChartTypes( sal_Bool SAL_CALL StockChartTypeTemplate::matchesTemplate( const uno::Reference< XDiagram >& xDiagram, sal_Bool /* bAdaptProperties */ ) - throw (uno::RuntimeException, std::exception) { bool bResult = false; @@ -484,7 +479,6 @@ sal_Bool SAL_CALL StockChartTypeTemplate::matchesTemplate( Reference< XChartType > SAL_CALL StockChartTypeTemplate::getChartTypeForNewSeries( const uno::Sequence< Reference< chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (uno::RuntimeException, std::exception) { Reference< chart2::XChartType > xResult; @@ -505,7 +499,6 @@ Reference< XChartType > SAL_CALL StockChartTypeTemplate::getChartTypeForNewSerie } Reference< XDataInterpreter > SAL_CALL StockChartTypeTemplate::getDataInterpreter() - throw (uno::RuntimeException, std::exception) { if( ! m_xDataInterpreter.is()) m_xDataInterpreter.set( new StockDataInterpreter( m_eStockVariant ) ); diff --git a/chart2/source/model/template/StockChartTypeTemplate.hxx b/chart2/source/model/template/StockChartTypeTemplate.hxx index 2a04ba2bec6a..f4884ac462e7 100644 --- a/chart2/source/model/template/StockChartTypeTemplate.hxx +++ b/chart2/source/model/template/StockChartTypeTemplate.hxx @@ -63,36 +63,29 @@ public: protected: // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XChartTypeTemplate ____ virtual sal_Bool SAL_CALL matchesTemplate( const css::uno::Reference< css::chart2::XDiagram >& xDiagram, - sal_Bool bAdaptProperties ) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool bAdaptProperties ) override; virtual css::uno::Reference< css::chart2::XChartType > SAL_CALL getChartTypeForNewSeries( const css::uno::Sequence< css::uno::Reference< - css::chart2::XChartType > >& aFormerlyUsedChartTypes ) - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() - throw (css::uno::RuntimeException, std::exception) override; + css::chart2::XChartType > >& aFormerlyUsedChartTypes ) override; + virtual css::uno::Reference< css::chart2::XDataInterpreter > SAL_CALL getDataInterpreter() override; virtual void SAL_CALL applyStyle( const css::uno::Reference< css::chart2::XDataSeries >& xSeries, ::sal_Int32 nChartTypeIndex, ::sal_Int32 nSeriesIndex, - ::sal_Int32 nSeriesCount ) - throw (css::uno::RuntimeException, std::exception) override; + ::sal_Int32 nSeriesCount ) override; virtual void SAL_CALL resetStyles( - const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::chart2::XDiagram >& xDiagram ) override; // ChartTypeTemplate virtual sal_Int32 getAxisCountByDimension( sal_Int32 nDimension ) override; diff --git a/chart2/source/model/template/StockDataInterpreter.cxx b/chart2/source/model/template/StockDataInterpreter.cxx index 2e2f5c0bbbd7..b1844f1da84a 100644 --- a/chart2/source/model/template/StockDataInterpreter.cxx +++ b/chart2/source/model/template/StockDataInterpreter.cxx @@ -54,7 +54,6 @@ InterpretedData SAL_CALL StockDataInterpreter::interpretDataSource( const Reference< data::XDataSource >& xSource, const Sequence< beans::PropertyValue >& rArguments, const Sequence< Reference< XDataSeries > >& rSeriesToReUse ) - throw (uno::RuntimeException, std::exception) { if( ! xSource.is()) return InterpretedData(); @@ -262,7 +261,6 @@ InterpretedData SAL_CALL StockDataInterpreter::interpretDataSource( // volume to one with volume) sal_Bool SAL_CALL StockDataInterpreter::isDataCompatible( const InterpretedData& aInterpretedData ) - throw (uno::RuntimeException, std::exception) { // high/low/close sal_Int32 nNumberOfNecessarySequences = 3; @@ -319,7 +317,6 @@ sal_Bool SAL_CALL StockDataInterpreter::isDataCompatible( InterpretedData SAL_CALL StockDataInterpreter::reinterpretDataSeries( const InterpretedData& aInterpretedData ) - throw (uno::RuntimeException, std::exception) { // prerequisite: StockDataInterpreter::isDataCompatible() returned true return aInterpretedData; diff --git a/chart2/source/model/template/StockDataInterpreter.hxx b/chart2/source/model/template/StockDataInterpreter.hxx index 0fb4df9acd7f..2bd5b2b61976 100644 --- a/chart2/source/model/template/StockDataInterpreter.hxx +++ b/chart2/source/model/template/StockDataInterpreter.hxx @@ -38,14 +38,11 @@ protected: virtual css::chart2::InterpretedData SAL_CALL interpretDataSource( const css::uno::Reference< css::chart2::data::XDataSource >& xSource, const css::uno::Sequence< css::beans::PropertyValue >& aArguments, - const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aSeriesToReUse ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aSeriesToReUse ) override; virtual sal_Bool SAL_CALL isDataCompatible( - const css::chart2::InterpretedData& aInterpretedData ) - throw (css::uno::RuntimeException, std::exception) override; + const css::chart2::InterpretedData& aInterpretedData ) override; virtual css::chart2::InterpretedData SAL_CALL reinterpretDataSeries( - const css::chart2::InterpretedData& aInterpretedData ) - throw (css::uno::RuntimeException, std::exception) override; + const css::chart2::InterpretedData& aInterpretedData ) override; private: StockChartTypeTemplate::StockVariant m_eStockVariant; diff --git a/chart2/source/model/template/XYDataInterpreter.cxx b/chart2/source/model/template/XYDataInterpreter.cxx index 1ecce05b21a2..c0d05a60ca98 100644 --- a/chart2/source/model/template/XYDataInterpreter.cxx +++ b/chart2/source/model/template/XYDataInterpreter.cxx @@ -50,7 +50,6 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::interpretDataSource( const Reference< chart2::data::XDataSource >& xSource, const Sequence< beans::PropertyValue >& aArguments, const Sequence< Reference< XDataSeries > >& aSeriesToReUse ) - throw (uno::RuntimeException, std::exception) { if( ! xSource.is()) return InterpretedData(); @@ -143,7 +142,6 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::interpretDataSource( chart2::InterpretedData SAL_CALL XYDataInterpreter::reinterpretDataSeries( const chart2::InterpretedData& aInterpretedData ) - throw (uno::RuntimeException, std::exception) { InterpretedData aResult( aInterpretedData ); @@ -232,7 +230,6 @@ chart2::InterpretedData SAL_CALL XYDataInterpreter::reinterpretDataSeries( // criterion: all series must have exactly two data::XLabeledDataSequences sal_Bool SAL_CALL XYDataInterpreter::isDataCompatible( const chart2::InterpretedData& aInterpretedData ) - throw (uno::RuntimeException, std::exception) { Sequence< Reference< XDataSeries > > aSeries( FlattenSequence( aInterpretedData.Series )); for( sal_Int32 i=0; i& xSource, const css::uno::Sequence< css::beans::PropertyValue >& aArguments, - const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aSeriesToReUse ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Reference< css::chart2::XDataSeries > >& aSeriesToReUse ) override; virtual css::chart2::InterpretedData SAL_CALL reinterpretDataSeries( - const css::chart2::InterpretedData& aInterpretedData ) - throw (css::uno::RuntimeException, std::exception) override; + const css::chart2::InterpretedData& aInterpretedData ) override; virtual sal_Bool SAL_CALL isDataCompatible( - const css::chart2::InterpretedData& aInterpretedData ) - throw (css::uno::RuntimeException, std::exception) override; + const css::chart2::InterpretedData& aInterpretedData ) override; }; } // namespace chart diff --git a/chart2/source/tools/CachedDataSequence.cxx b/chart2/source/tools/CachedDataSequence.cxx index 14792358c3b1..c702a1ab2489 100644 --- a/chart2/source/tools/CachedDataSequence.cxx +++ b/chart2/source/tools/CachedDataSequence.cxx @@ -226,7 +226,6 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( CachedDataSequence, CachedDataSequence_Base, O // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL CachedDataSequence::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { return Reference< beans::XPropertySetInfo >( createPropertySetInfo( getInfoHelper() ) ); } @@ -248,19 +247,16 @@ Reference< beans::XPropertySetInfo > SAL_CALL CachedDataSequence::getPropertySet } OUString SAL_CALL CachedDataSequence::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString(lcl_aServiceName); } sal_Bool SAL_CALL CachedDataSequence::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL CachedDataSequence::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName, @@ -272,7 +268,6 @@ css::uno::Sequence< OUString > SAL_CALL CachedDataSequence::getSupportedServiceN // ________ XNumericalDataSequence ________ Sequence< double > SAL_CALL CachedDataSequence::getNumericalData() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); @@ -284,7 +279,6 @@ Sequence< double > SAL_CALL CachedDataSequence::getNumericalData() // ________ XTextualDataSequence ________ Sequence< OUString > SAL_CALL CachedDataSequence::getTextualData() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); @@ -296,34 +290,28 @@ Sequence< OUString > SAL_CALL CachedDataSequence::getTextualData() // ________ XDataSequence ________ Sequence< Any > SAL_CALL CachedDataSequence::getData() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); return Impl_getMixedData(); } OUString SAL_CALL CachedDataSequence::getSourceRangeRepresentation() - throw (uno::RuntimeException, std::exception) { return m_sRole; } Sequence< OUString > SAL_CALL CachedDataSequence::generateLabel( chart2::data::LabelOrigin /*eLabelOrigin*/ ) - throw (uno::RuntimeException, std::exception) { // return empty label, as we have no range representaions to determine something useful return Sequence< OUString >(); } ::sal_Int32 SAL_CALL CachedDataSequence::getNumberFormatKeyByIndex( ::sal_Int32 /*nIndex*/ ) - throw (lang::IndexOutOfBoundsException, - uno::RuntimeException, std::exception) { return 0; } Reference< util::XCloneable > SAL_CALL CachedDataSequence::createClone() - throw (uno::RuntimeException, std::exception) { CachedDataSequence * pNewSeq = new CachedDataSequence( *this ); @@ -331,7 +319,6 @@ Reference< util::XCloneable > SAL_CALL CachedDataSequence::createClone() } void SAL_CALL CachedDataSequence::addModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -345,7 +332,6 @@ void SAL_CALL CachedDataSequence::addModifyListener( const Reference< util::XMod } void SAL_CALL CachedDataSequence::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -359,7 +345,7 @@ void SAL_CALL CachedDataSequence::removeModifyListener( const Reference< util::X } // lang::XInitialization: -void SAL_CALL CachedDataSequence::initialize(const uno::Sequence< uno::Any > & _aArguments) throw (uno::RuntimeException, uno::Exception, std::exception) +void SAL_CALL CachedDataSequence::initialize(const uno::Sequence< uno::Any > & _aArguments) { ::comphelper::SequenceAsHashMap aMap(_aArguments); m_aNumericalSequence = aMap.getUnpackedValueOrDefault( "DataSequence" ,m_aNumericalSequence); diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx index e1b842dda7ac..2926cc0eabf2 100644 --- a/chart2/source/tools/ConfigColorScheme.cxx +++ b/chart2/source/tools/ConfigColorScheme.cxx @@ -139,7 +139,6 @@ void ConfigColorScheme::retrieveConfigColors() // ____ XColorScheme ____ ::sal_Int32 SAL_CALL ConfigColorScheme::getColorByIndex( ::sal_Int32 nIndex ) - throw (uno::RuntimeException, std::exception) { if( m_bNeedsUpdate ) retrieveConfigColors(); @@ -166,19 +165,16 @@ void ConfigColorScheme::notify( const OUString & rPropertyName ) } OUString SAL_CALL ConfigColorScheme::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart2.ConfigDefaultColorScheme") ; } sal_Bool SAL_CALL ConfigColorScheme::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL ConfigColorScheme::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart2.ColorScheme" }; } diff --git a/chart2/source/tools/DataSource.cxx b/chart2/source/tools/DataSource.cxx index 16c18ddb8e2b..dc1122e6eca2 100644 --- a/chart2/source/tools/DataSource.cxx +++ b/chart2/source/tools/DataSource.cxx @@ -45,32 +45,27 @@ DataSource::~DataSource() // ____ XDataSource ____ Sequence< Reference< chart2::data::XLabeledDataSequence > > SAL_CALL DataSource::getDataSequences() - throw (uno::RuntimeException, std::exception) { return m_aDataSeq; } // ____ XDataSink ____ void SAL_CALL DataSource::setData( const Sequence< Reference< chart2::data::XLabeledDataSequence > >& aData ) - throw (uno::RuntimeException, std::exception) { m_aDataSeq = aData; } OUString SAL_CALL DataSource::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart.DataSource"); } sal_Bool SAL_CALL DataSource::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL DataSource::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart2.data.DataSource" }; } diff --git a/chart2/source/tools/ErrorBar.cxx b/chart2/source/tools/ErrorBar.cxx index aa4573df29df..d717d09dca98 100644 --- a/chart2/source/tools/ErrorBar.cxx +++ b/chart2/source/tools/ErrorBar.cxx @@ -129,14 +129,12 @@ ErrorBar::~ErrorBar() {} uno::Reference< util::XCloneable > SAL_CALL ErrorBar::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new ErrorBar( *this )); } // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL ErrorBar::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { static uno::Reference< beans::XPropertySetInfo > aRef ( new SfxItemPropertySetInfo( GetErrorBarPropertySet()->getPropertyMap() ) ); @@ -144,8 +142,6 @@ uno::Reference< beans::XPropertySetInfo > SAL_CALL ErrorBar::getPropertySetInfo( } void ErrorBar::setPropertyValue( const OUString& rPropName, const uno::Any& rAny ) - throw (beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -228,7 +224,6 @@ OUString getSourceRangeStrFromLabeledSequences( const uno::Sequence< uno::Refere } uno::Any ErrorBar::getPropertyValue(const OUString& rPropName) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SolarMutexGuard aGuard; @@ -293,7 +288,6 @@ uno::Any ErrorBar::getPropertyValue(const OUString& rPropName) } beans::PropertyState ErrorBar::getPropertyState( const OUString& rPropName ) - throw (css::beans::UnknownPropertyException, std::exception) { if(rPropName == "ErrorBarStyle") { @@ -364,7 +358,6 @@ beans::PropertyState ErrorBar::getPropertyState( const OUString& rPropName ) } uno::Sequence< beans::PropertyState > ErrorBar::getPropertyStates( const uno::Sequence< OUString >& rPropNames ) - throw (css::beans::UnknownPropertyException, std::exception) { uno::Sequence< beans::PropertyState > aRet( rPropNames.getLength() ); for(sal_Int32 i = 0; i < rPropNames.getLength(); ++i) @@ -375,41 +368,34 @@ uno::Sequence< beans::PropertyState > ErrorBar::getPropertyStates( const uno::Se } void ErrorBar::setPropertyToDefault( const OUString& ) - throw (beans::UnknownPropertyException, std::exception) { //keep them unimplemented for now } uno::Any ErrorBar::getPropertyDefault( const OUString& ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, std::exception) { //keep them unimplemented for now return uno::Any(); } void ErrorBar::addPropertyChangeListener( const OUString&, const css::uno::Reference< css::beans::XPropertyChangeListener >& ) - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { } void ErrorBar::removePropertyChangeListener( const OUString&, const css::uno::Reference< css::beans::XPropertyChangeListener >& ) - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { } void ErrorBar::addVetoableChangeListener( const OUString&, const css::uno::Reference< css::beans::XVetoableChangeListener >& ) - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { } void ErrorBar::removeVetoableChangeListener( const OUString&, const css::uno::Reference< css::beans::XVetoableChangeListener >& ) - throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { } // ____ XModifyBroadcaster ____ void SAL_CALL ErrorBar::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -423,7 +409,6 @@ void SAL_CALL ErrorBar::addModifyListener( const uno::Reference< util::XModifyLi } void SAL_CALL ErrorBar::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -438,21 +423,18 @@ void SAL_CALL ErrorBar::removeModifyListener( const uno::Reference< util::XModif // ____ XModifyListener ____ void SAL_CALL ErrorBar::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { m_xModifyEventForwarder->modified( aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL ErrorBar::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException, std::exception) { // nothing } // ____ XDataSink ____ void SAL_CALL ErrorBar::setData( const uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > >& aData ) - throw (uno::RuntimeException, std::exception) { ModifyListenerHelper::removeListenerFromAllElements( m_aDataSequences, m_xModifyEventForwarder ); EventListenerHelper::removeListenerFromAllElements( m_aDataSequences, this ); @@ -463,25 +445,21 @@ void SAL_CALL ErrorBar::setData( const uno::Sequence< uno::Reference< chart2::da // ____ XDataSource ____ uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence > > SAL_CALL ErrorBar::getDataSequences() - throw (uno::RuntimeException, std::exception) { return comphelper::containerToSequence( m_aDataSequences ); } OUString SAL_CALL ErrorBar::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString(lcl_aServiceName); } sal_Bool SAL_CALL ErrorBar::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL ErrorBar::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName, diff --git a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx index d620576d3e30..b1439867a449 100644 --- a/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/ExponentialRegressionCurveCalculator.cxx @@ -46,7 +46,6 @@ ExponentialRegressionCurveCalculator::~ExponentialRegressionCurveCalculator() void SAL_CALL ExponentialRegressionCurveCalculator::recalculateRegression( const uno::Sequence< double >& aXValues, const uno::Sequence< double >& aYValues ) - throw (uno::RuntimeException, std::exception) { RegressionCalculationHelper::tDoubleVectorPair aValues( RegressionCalculationHelper::cleanup( @@ -113,8 +112,6 @@ void SAL_CALL ExponentialRegressionCurveCalculator::recalculateRegression( } double SAL_CALL ExponentialRegressionCurveCalculator::getCurveValue( double x ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { double fResult; ::rtl::math::setNan( & fResult ); @@ -133,8 +130,6 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL ExponentialRegressionCurveCalcul const uno::Reference< chart2::XScaling >& xScalingX, const uno::Reference< chart2::XScaling >& xScalingY, sal_Bool bMaySkipPointsInCalculation ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { if( bMaySkipPointsInCalculation && isLinearScaling( xScalingX ) && diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx index 9f5f3187fd36..f14810a9e64b 100644 --- a/chart2/source/tools/InternalDataProvider.cxx +++ b/chart2/source/tools/InternalDataProvider.cxx @@ -653,7 +653,6 @@ Reference< chart2::data::XDataSequence > InternalDataProvider::createDataSequenc // ____ XDataProvider ____ sal_Bool SAL_CALL InternalDataProvider::createDataSourcePossible( const Sequence< beans::PropertyValue >& /* aArguments */ ) - throw (uno::RuntimeException, std::exception) { return true; } @@ -678,8 +677,6 @@ sal_Int32 lcl_getInnerLevelCount( const vector< vector< uno::Any > >& rLabels ) Reference< chart2::data::XDataSource > SAL_CALL InternalDataProvider::createDataSource( const Sequence< beans::PropertyValue >& aArguments ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { OUString aRangeRepresentation; bool bUseColumns = true; @@ -769,7 +766,6 @@ Reference< chart2::data::XDataSource > SAL_CALL InternalDataProvider::createData Sequence< beans::PropertyValue > SAL_CALL InternalDataProvider::detectArguments( const Reference< chart2::data::XDataSource >& /* xDataSource */ ) - throw (uno::RuntimeException, std::exception) { Sequence< beans::PropertyValue > aArguments( 4 ); aArguments[0] = beans::PropertyValue( @@ -794,15 +790,12 @@ Sequence< beans::PropertyValue > SAL_CALL InternalDataProvider::detectArguments( } sal_Bool SAL_CALL InternalDataProvider::createDataSequenceByRangeRepresentationPossible( const OUString& /* aRangeRepresentation */ ) - throw (uno::RuntimeException, std::exception) { return true; } Reference< chart2::data::XDataSequence > SAL_CALL InternalDataProvider::createDataSequenceByRangeRepresentation( const OUString& aRangeRepresentation ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { if( aRangeRepresentation.match( lcl_aCategoriesRangeName )) { @@ -836,13 +829,11 @@ Reference< chart2::data::XDataSequence > SAL_CALL InternalDataProvider::createDa Reference SAL_CALL InternalDataProvider::createDataSequenceByValueArray( const OUString& aRole, const OUString& aRangeRepresentation ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { return createDataSequenceFromArray(aRangeRepresentation, aRole); } Reference< sheet::XRangeSelection > SAL_CALL InternalDataProvider::getRangeSelection() - throw (uno::RuntimeException, std::exception) { // there is no range selection component return Reference< sheet::XRangeSelection >(); @@ -850,7 +841,6 @@ Reference< sheet::XRangeSelection > SAL_CALL InternalDataProvider::getRangeSelec // ____ XInternalDataProvider ____ sal_Bool SAL_CALL InternalDataProvider::hasDataByRangeRepresentation( const OUString& aRange ) - throw (uno::RuntimeException, std::exception) { bool bResult = false; @@ -874,7 +864,6 @@ sal_Bool SAL_CALL InternalDataProvider::hasDataByRangeRepresentation( const OUSt } Sequence< uno::Any > SAL_CALL InternalDataProvider::getDataByRangeRepresentation( const OUString& aRange ) - throw (uno::RuntimeException, std::exception) { Sequence< uno::Any > aResult; @@ -948,7 +937,6 @@ Sequence< uno::Any > SAL_CALL InternalDataProvider::getDataByRangeRepresentation void SAL_CALL InternalDataProvider::setDataByRangeRepresentation( const OUString& aRange, const Sequence< uno::Any >& aNewData ) - throw (uno::RuntimeException, std::exception) { vector< uno::Any > aNewVector( ContainerHelper::SequenceToVector(aNewData) ); if( aRange.match( lcl_aLabelRangePrefix ) ) @@ -1014,7 +1002,6 @@ void SAL_CALL InternalDataProvider::setDataByRangeRepresentation( } void SAL_CALL InternalDataProvider::insertSequence( ::sal_Int32 nAfterIndex ) - throw (uno::RuntimeException, std::exception) { if( m_bDataInColumns ) { @@ -1029,7 +1016,6 @@ void SAL_CALL InternalDataProvider::insertSequence( ::sal_Int32 nAfterIndex ) } void SAL_CALL InternalDataProvider::deleteSequence( ::sal_Int32 nAtIndex ) - throw (uno::RuntimeException, std::exception) { deleteMapReferences( OUString::number( nAtIndex )); deleteMapReferences( lcl_aLabelRangePrefix + OUString::number( nAtIndex )); @@ -1046,7 +1032,6 @@ void SAL_CALL InternalDataProvider::deleteSequence( ::sal_Int32 nAtIndex ) } void SAL_CALL InternalDataProvider::appendSequence() - throw (uno::RuntimeException, std::exception) { if( m_bDataInColumns ) m_aInternalData.appendColumn(); @@ -1055,7 +1040,6 @@ void SAL_CALL InternalDataProvider::appendSequence() } void SAL_CALL InternalDataProvider::insertComplexCategoryLevel( sal_Int32 nLevel ) - throw (uno::RuntimeException, std::exception) { OSL_ENSURE( nLevel> 0, "you can only insert category levels > 0" );//the first categories level cannot be deleted, check the calling code for error if( nLevel>0 ) @@ -1072,7 +1056,6 @@ void SAL_CALL InternalDataProvider::insertComplexCategoryLevel( sal_Int32 nLevel } } void SAL_CALL InternalDataProvider::deleteComplexCategoryLevel( sal_Int32 nLevel ) - throw (uno::RuntimeException, std::exception) { OSL_ENSURE( nLevel>0, "you can only delete category levels > 0" );//the first categories level cannot be deleted, check the calling code for error if( nLevel>0 ) @@ -1090,7 +1073,6 @@ void SAL_CALL InternalDataProvider::deleteComplexCategoryLevel( sal_Int32 nLevel } void SAL_CALL InternalDataProvider::insertDataPointForAllSequences( ::sal_Int32 nAfterIndex ) - throw (uno::RuntimeException, std::exception) { sal_Int32 nMaxRep = 0; if( m_bDataInColumns ) @@ -1114,7 +1096,6 @@ void SAL_CALL InternalDataProvider::insertDataPointForAllSequences( ::sal_Int32 } void SAL_CALL InternalDataProvider::deleteDataPointForAllSequences( ::sal_Int32 nAtIndex ) - throw (uno::RuntimeException, std::exception) { sal_Int32 nMaxRep = 0; if( m_bDataInColumns ) @@ -1138,7 +1119,6 @@ void SAL_CALL InternalDataProvider::deleteDataPointForAllSequences( ::sal_Int32 } void SAL_CALL InternalDataProvider::swapDataPointWithNextOneForAllSequences( ::sal_Int32 nAtIndex ) - throw (uno::RuntimeException, std::exception) { if( m_bDataInColumns ) m_aInternalData.swapRowWithNext( nAtIndex ); @@ -1158,7 +1138,6 @@ void SAL_CALL InternalDataProvider::swapDataPointWithNextOneForAllSequences( ::s } void SAL_CALL InternalDataProvider::registerDataSequenceForChanges( const Reference< chart2::data::XDataSequence >& xSeq ) - throw (uno::RuntimeException, std::exception) { if( xSeq.is()) addDataSequenceToMap( xSeq->getSourceRangeRepresentation(), xSeq ); @@ -1166,8 +1145,6 @@ void SAL_CALL InternalDataProvider::registerDataSequenceForChanges( const Refere // ____ XRangeXMLConversion ____ OUString SAL_CALL InternalDataProvider::convertRangeToXML( const OUString& aRangeRepresentation ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { XMLRangeHelper::CellRange aRange; aRange.aTableName = "local-table"; @@ -1244,8 +1221,6 @@ OUString SAL_CALL InternalDataProvider::convertRangeToXML( const OUString& aRang } OUString SAL_CALL InternalDataProvider::convertRangeFromXML( const OUString& aXMLRange ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { XMLRangeHelper::CellRange aRange( XMLRangeHelper::getCellRangeFromXMLString( aXMLRange )); if( aRange.aUpperLeft.bIsEmpty ) @@ -1372,7 +1347,7 @@ uno::Sequence< OUString > SplitCategoriesProvider_ForComplexDescriptions::getStr }//anonymous namespace // ____ XDateCategories ____ -Sequence< double > SAL_CALL InternalDataProvider::getDateCategories() throw (uno::RuntimeException, std::exception) +Sequence< double > SAL_CALL InternalDataProvider::getDateCategories() { double fNan = InternalDataProvider::getNotANumber(); double fValue = fNan; @@ -1390,7 +1365,7 @@ Sequence< double > SAL_CALL InternalDataProvider::getDateCategories() throw (uno return aDoubles; } -void SAL_CALL InternalDataProvider::setDateCategories( const Sequence< double >& rDates ) throw (uno::RuntimeException, std::exception) +void SAL_CALL InternalDataProvider::setDateCategories( const Sequence< double >& rDates ) { sal_Int32 nCount = rDates.getLength(); vector< vector< uno::Any > > aNewCategories; @@ -1410,56 +1385,53 @@ void SAL_CALL InternalDataProvider::setDateCategories( const Sequence< double >& } // ____ XAnyDescriptionAccess ____ -Sequence< Sequence< uno::Any > > SAL_CALL InternalDataProvider::getAnyRowDescriptions() throw (uno::RuntimeException, std::exception) +Sequence< Sequence< uno::Any > > SAL_CALL InternalDataProvider::getAnyRowDescriptions() { return lcl_convertVectorVectorToSequenceSequence( m_aInternalData.getComplexRowLabels() ); } -void SAL_CALL InternalDataProvider::setAnyRowDescriptions( const Sequence< Sequence< uno::Any > >& aRowDescriptions ) throw (uno::RuntimeException, std::exception) +void SAL_CALL InternalDataProvider::setAnyRowDescriptions( const Sequence< Sequence< uno::Any > >& aRowDescriptions ) { m_aInternalData.setComplexRowLabels( lcl_convertSequenceSequenceToVectorVector( aRowDescriptions ) ); } -Sequence< Sequence< uno::Any > > SAL_CALL InternalDataProvider::getAnyColumnDescriptions() throw (uno::RuntimeException, std::exception) +Sequence< Sequence< uno::Any > > SAL_CALL InternalDataProvider::getAnyColumnDescriptions() { return lcl_convertVectorVectorToSequenceSequence( m_aInternalData.getComplexColumnLabels() ); } -void SAL_CALL InternalDataProvider::setAnyColumnDescriptions( const Sequence< Sequence< uno::Any > >& aColumnDescriptions ) throw (uno::RuntimeException, std::exception) +void SAL_CALL InternalDataProvider::setAnyColumnDescriptions( const Sequence< Sequence< uno::Any > >& aColumnDescriptions ) { m_aInternalData.setComplexColumnLabels( lcl_convertSequenceSequenceToVectorVector( aColumnDescriptions ) ); } // ____ XComplexDescriptionAccess ____ -Sequence< Sequence< OUString > > SAL_CALL InternalDataProvider::getComplexRowDescriptions() throw (uno::RuntimeException, std::exception) +Sequence< Sequence< OUString > > SAL_CALL InternalDataProvider::getComplexRowDescriptions() { return comphelper::containerToSequence(lcl_convertComplexAnyVectorToStringSequence( m_aInternalData.getComplexRowLabels() )); } -void SAL_CALL InternalDataProvider::setComplexRowDescriptions( const Sequence< Sequence< OUString > >& aRowDescriptions ) throw (uno::RuntimeException, std::exception) +void SAL_CALL InternalDataProvider::setComplexRowDescriptions( const Sequence< Sequence< OUString > >& aRowDescriptions ) { m_aInternalData.setComplexRowLabels( lcl_convertComplexStringSequenceToAnyVector(aRowDescriptions) ); } -Sequence< Sequence< OUString > > SAL_CALL InternalDataProvider::getComplexColumnDescriptions() throw (uno::RuntimeException, std::exception) +Sequence< Sequence< OUString > > SAL_CALL InternalDataProvider::getComplexColumnDescriptions() { return comphelper::containerToSequence(lcl_convertComplexAnyVectorToStringSequence( m_aInternalData.getComplexColumnLabels() )); } -void SAL_CALL InternalDataProvider::setComplexColumnDescriptions( const Sequence< Sequence< OUString > >& aColumnDescriptions ) throw (uno::RuntimeException, std::exception) +void SAL_CALL InternalDataProvider::setComplexColumnDescriptions( const Sequence< Sequence< OUString > >& aColumnDescriptions ) { m_aInternalData.setComplexColumnLabels( lcl_convertComplexStringSequenceToAnyVector(aColumnDescriptions) ); } // ____ XChartDataArray ____ Sequence< Sequence< double > > SAL_CALL InternalDataProvider::getData() - throw (uno::RuntimeException, std::exception) { return m_aInternalData.getData(); } void SAL_CALL InternalDataProvider::setData( const Sequence< Sequence< double > >& rDataInRows ) - throw (uno::RuntimeException, std::exception) { return m_aInternalData.setData( rDataInRows ); } void SAL_CALL InternalDataProvider::setRowDescriptions( const Sequence< OUString >& aRowDescriptions ) - throw (uno::RuntimeException, std::exception) { vector< vector< uno::Any > > aComplexDescriptions( aRowDescriptions.getLength() ); transform( aComplexDescriptions.begin(), aComplexDescriptions.end(), aRowDescriptions.getConstArray(), @@ -1468,7 +1440,6 @@ void SAL_CALL InternalDataProvider::setRowDescriptions( const Sequence< OUString } void SAL_CALL InternalDataProvider::setColumnDescriptions( const Sequence< OUString >& aColumnDescriptions ) - throw (uno::RuntimeException, std::exception) { vector< vector< uno::Any > > aComplexDescriptions( aColumnDescriptions.getLength() ); transform( aComplexDescriptions.begin(), aComplexDescriptions.end(), aColumnDescriptions.getConstArray(), @@ -1477,7 +1448,6 @@ void SAL_CALL InternalDataProvider::setColumnDescriptions( const Sequence< OUStr } Sequence< OUString > SAL_CALL InternalDataProvider::getRowDescriptions() - throw (uno::RuntimeException, std::exception) { vector< vector< uno::Any > > aComplexLabels( m_aInternalData.getComplexRowLabels() ); SplitCategoriesProvider_ForComplexDescriptions aProvider( aComplexLabels ); @@ -1485,7 +1455,6 @@ Sequence< OUString > SAL_CALL InternalDataProvider::getRowDescriptions() } Sequence< OUString > SAL_CALL InternalDataProvider::getColumnDescriptions() - throw (uno::RuntimeException, std::exception) { vector< vector< uno::Any > > aComplexLabels( m_aInternalData.getComplexColumnLabels() ); SplitCategoriesProvider_ForComplexDescriptions aProvider( aComplexLabels ); @@ -1495,18 +1464,15 @@ Sequence< OUString > SAL_CALL InternalDataProvider::getColumnDescriptions() // ____ XChartData (base of XChartDataArray) ____ void SAL_CALL InternalDataProvider::addChartDataChangeEventListener( const Reference< css::chart::XChartDataChangeEventListener >& ) - throw (uno::RuntimeException, std::exception) { } void SAL_CALL InternalDataProvider::removeChartDataChangeEventListener( const Reference< css::chart::XChartDataChangeEventListener >& ) - throw (uno::RuntimeException, std::exception) { } double SAL_CALL InternalDataProvider::getNotANumber() - throw (uno::RuntimeException, std::exception) { double fNan; ::rtl::math::setNan( & fNan ); @@ -1514,13 +1480,12 @@ double SAL_CALL InternalDataProvider::getNotANumber() } sal_Bool SAL_CALL InternalDataProvider::isNotANumber( double nNumber ) - throw (uno::RuntimeException, std::exception) { return ::rtl::math::isNan( nNumber ) || ::rtl::math::isInf( nNumber ); } // lang::XInitialization: -void SAL_CALL InternalDataProvider::initialize(const uno::Sequence< uno::Any > & _aArguments) throw (uno::RuntimeException, uno::Exception, std::exception) +void SAL_CALL InternalDataProvider::initialize(const uno::Sequence< uno::Any > & _aArguments) { comphelper::SequenceAsHashMap aArgs(_aArguments); if ( aArgs.getUnpackedValueOrDefault( "CreateDefaultData", false ) ) @@ -1529,26 +1494,22 @@ void SAL_CALL InternalDataProvider::initialize(const uno::Sequence< uno::Any > & // ____ XCloneable ____ Reference< util::XCloneable > SAL_CALL InternalDataProvider::createClone() - throw (uno::RuntimeException, std::exception) { return Reference< util::XCloneable >( new InternalDataProvider( *this )); } OUString SAL_CALL InternalDataProvider::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { // note: in xmloff this name is used to indicate usage of own data return OUString("com.sun.star.comp.chart.InternalDataProvider"); } sal_Bool SAL_CALL InternalDataProvider::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL InternalDataProvider::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart2.data.DataProvider" }; } diff --git a/chart2/source/tools/LabeledDataSequence.cxx b/chart2/source/tools/LabeledDataSequence.cxx index d5c45694d9c6..279db333e066 100644 --- a/chart2/source/tools/LabeledDataSequence.cxx +++ b/chart2/source/tools/LabeledDataSequence.cxx @@ -66,14 +66,12 @@ LabeledDataSequence::~LabeledDataSequence() // ____ XLabeledDataSequence ____ uno::Reference< chart2::data::XDataSequence > SAL_CALL LabeledDataSequence::getValues() - throw (uno::RuntimeException, std::exception) { return m_xData; } void SAL_CALL LabeledDataSequence::setValues( const uno::Reference< chart2::data::XDataSequence >& xSequence ) - throw (uno::RuntimeException, std::exception) { if( m_xData != xSequence ) { @@ -84,14 +82,12 @@ void SAL_CALL LabeledDataSequence::setValues( } uno::Reference< chart2::data::XDataSequence > SAL_CALL LabeledDataSequence::getLabel() - throw (uno::RuntimeException, std::exception) { return m_xLabel; } void SAL_CALL LabeledDataSequence::setLabel( const uno::Reference< chart2::data::XDataSequence >& xSequence ) - throw (uno::RuntimeException, std::exception) { if( m_xLabel != xSequence ) { @@ -103,7 +99,6 @@ void SAL_CALL LabeledDataSequence::setLabel( // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL LabeledDataSequence::createClone() - throw (uno::RuntimeException, std::exception) { uno::Reference< chart2::data::XDataSequence > xNewValues( m_xData ); uno::Reference< chart2::data::XDataSequence > xNewLabel( m_xLabel ); @@ -122,7 +117,6 @@ uno::Reference< util::XCloneable > SAL_CALL LabeledDataSequence::createClone() // ____ XModifyBroadcaster ____ void SAL_CALL LabeledDataSequence::addModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -136,7 +130,6 @@ void SAL_CALL LabeledDataSequence::addModifyListener( const Reference< util::XMo } void SAL_CALL LabeledDataSequence::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -150,19 +143,16 @@ void SAL_CALL LabeledDataSequence::removeModifyListener( const Reference< util:: } OUString SAL_CALL LabeledDataSequence::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart2.LabeledDataSequence"); } sal_Bool SAL_CALL LabeledDataSequence::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL LabeledDataSequence::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart2.data.LabeledDataSequence" }; } diff --git a/chart2/source/tools/LifeTime.cxx b/chart2/source/tools/LifeTime.cxx index 2dbb9ba7ece2..b04f0a82a548 100644 --- a/chart2/source/tools/LifeTime.cxx +++ b/chart2/source/tools/LifeTime.cxx @@ -110,7 +110,6 @@ void LifeTimeManager::impl_unregisterApiCall(bool bLongLastingCall) } bool LifeTimeManager::dispose() - throw(uno::RuntimeException) { //hold no mutex { @@ -190,7 +189,6 @@ bool CloseableLifeTimeManager::impl_isDisposedOrClosed( bool bAssert ) } bool CloseableLifeTimeManager::g_close_startTryClose(bool bDeliverOwnership) - throw ( uno::Exception ) { //no mutex is allowed to be acquired { @@ -263,7 +261,6 @@ void CloseableLifeTimeManager::g_close_endTryClose(bool bDeliverOwnership, bool } bool CloseableLifeTimeManager::g_close_isNeedToCancelLongLastingCalls( bool bDeliverOwnership, util::CloseVetoException& ex ) - throw ( util::CloseVetoException ) { //this method is called when no closelistener has had a veto during queryclosing //the method returns false, if nothing stands against closing anymore @@ -369,7 +366,6 @@ void CloseableLifeTimeManager::impl_doClose() } void CloseableLifeTimeManager::g_addCloseListener( const uno::Reference< util::XCloseListener > & xListener ) - throw(uno::RuntimeException) { osl::Guard< osl::Mutex > aGuard( m_aAccessMutex ); //Mutex needs to be acquired exactly ones; will be released inbetween diff --git a/chart2/source/tools/LinearRegressionCurveCalculator.cxx b/chart2/source/tools/LinearRegressionCurveCalculator.cxx index 05f6aefe66a1..7c6e5240d14e 100644 --- a/chart2/source/tools/LinearRegressionCurveCalculator.cxx +++ b/chart2/source/tools/LinearRegressionCurveCalculator.cxx @@ -41,7 +41,6 @@ void LinearRegressionCurveCalculator::setRegressionProperties( sal_Bool aForceIntercept, double aInterceptValue, sal_Int32 aPeriod ) - throw (uno::RuntimeException, std::exception) { PolynomialRegressionCurveCalculator::setRegressionProperties( 1, @@ -55,8 +54,6 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL LinearRegressionCurveCalculator: const uno::Reference< chart2::XScaling >& xScalingX, const uno::Reference< chart2::XScaling >& xScalingY, sal_Bool bMaySkipPointsInCalculation ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { if( bMaySkipPointsInCalculation && isLinearScaling( xScalingX ) && diff --git a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx index c50a8c361b24..a69d68ea4137 100644 --- a/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx +++ b/chart2/source/tools/LogarithmicRegressionCurveCalculator.cxx @@ -45,7 +45,6 @@ LogarithmicRegressionCurveCalculator::~LogarithmicRegressionCurveCalculator() void SAL_CALL LogarithmicRegressionCurveCalculator::recalculateRegression( const uno::Sequence< double >& aXValues, const uno::Sequence< double >& aYValues ) - throw (uno::RuntimeException, std::exception) { RegressionCalculationHelper::tDoubleVectorPair aValues( RegressionCalculationHelper::cleanup( @@ -90,8 +89,6 @@ void SAL_CALL LogarithmicRegressionCurveCalculator::recalculateRegression( } double SAL_CALL LogarithmicRegressionCurveCalculator::getCurveValue( double x ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { double fResult; ::rtl::math::setNan( & fResult ); @@ -110,8 +107,6 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL LogarithmicRegressionCurveCalcul const uno::Reference< chart2::XScaling >& xScalingX, const uno::Reference< chart2::XScaling >& xScalingY, sal_Bool bMaySkipPointsInCalculation ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { if( bMaySkipPointsInCalculation && isLogarithmicScaling( xScalingX ) && diff --git a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx index 3835a46ccbef..592a2014e340 100644 --- a/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx +++ b/chart2/source/tools/MeanValueRegressionCurveCalculator.cxx @@ -43,7 +43,6 @@ MeanValueRegressionCurveCalculator::~MeanValueRegressionCurveCalculator() void SAL_CALL MeanValueRegressionCurveCalculator::recalculateRegression( const uno::Sequence< double >& /*aXValues*/, const uno::Sequence< double >& aYValues ) - throw (uno::RuntimeException, std::exception) { const sal_Int32 nDataLength = aYValues.getLength(); sal_Int32 nMax = nDataLength; @@ -89,8 +88,6 @@ void SAL_CALL MeanValueRegressionCurveCalculator::recalculateRegression( } double SAL_CALL MeanValueRegressionCurveCalculator::getCurveValue( double /*x*/ ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { return m_fMeanValue; } @@ -100,8 +97,6 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL MeanValueRegressionCurveCalculat const uno::Reference< chart2::XScaling >& xScalingX, const uno::Reference< chart2::XScaling >& xScalingY, sal_Bool bMaySkipPointsInCalculation ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { if( bMaySkipPointsInCalculation ) { diff --git a/chart2/source/tools/ModifyListenerHelper.cxx b/chart2/source/tools/ModifyListenerHelper.cxx index 7b4c26156e11..44fd89e248e8 100644 --- a/chart2/source/tools/ModifyListenerHelper.cxx +++ b/chart2/source/tools/ModifyListenerHelper.cxx @@ -157,27 +157,23 @@ void ModifyEventForwarder::DisposeAndClear( const Reference< uno::XWeak > & xSou // ____ XModifyBroadcaster ____ void SAL_CALL ModifyEventForwarder::addModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { AddListener( aListener ); } void SAL_CALL ModifyEventForwarder::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { RemoveListener( aListener ); } // ____ XModifyListener ____ void SAL_CALL ModifyEventForwarder::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { lcl_fireModifyEvent( m_aModifyListeners, Reference< uno::XWeak >(), &aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL ModifyEventForwarder::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException, std::exception) { // nothing } diff --git a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx index dac1616b7ab7..85406c9d62d4 100644 --- a/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx +++ b/chart2/source/tools/MovingAverageRegressionCurveCalculator.cxx @@ -41,7 +41,6 @@ MovingAverageRegressionCurveCalculator::~MovingAverageRegressionCurveCalculator( void SAL_CALL MovingAverageRegressionCurveCalculator::recalculateRegression( const uno::Sequence< double >& aXValues, const uno::Sequence< double >& aYValues ) - throw (uno::RuntimeException, std::exception) { ::rtl::math::setNan( & m_fCorrelationCoeffitient ); @@ -73,8 +72,6 @@ void SAL_CALL MovingAverageRegressionCurveCalculator::recalculateRegression( } double SAL_CALL MovingAverageRegressionCurveCalculator::getCurveValue( double /*x*/ ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { double fResult; rtl::math::setNan(&fResult); @@ -86,8 +83,6 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL MovingAverageRegressionCurveCalc const uno::Reference< chart2::XScaling >& /*xScalingX*/, const uno::Reference< chart2::XScaling >& /*xScalingY*/, sal_Bool /*bMaySkipPointsInCalculation*/ ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { uno::Sequence< geometry::RealPoint2D > aResult( aYList.size() ); diff --git a/chart2/source/tools/NameContainer.cxx b/chart2/source/tools/NameContainer.cxx index ab2d48ec636b..58e9296a678b 100644 --- a/chart2/source/tools/NameContainer.cxx +++ b/chart2/source/tools/NameContainer.cxx @@ -59,26 +59,22 @@ NameContainer::~NameContainer() //XServiceInfo OUString SAL_CALL NameContainer::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return m_aImplementationName; } sal_Bool SAL_CALL NameContainer::supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } Sequence< OUString > SAL_CALL NameContainer::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { m_aServicename }; } // XNameContainer void SAL_CALL NameContainer::insertByName( const OUString& rName, const Any& rElement ) - throw( lang::IllegalArgumentException, container::ElementExistException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { if( m_aMap.find( rName ) != m_aMap.end() ) throw container::ElementExistException(); @@ -86,7 +82,6 @@ void SAL_CALL NameContainer::insertByName( const OUString& rName, const Any& rEl } void SAL_CALL NameContainer::removeByName( const OUString& Name ) - throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { tContentMap::iterator aIt( m_aMap.find( Name )); if( aIt == m_aMap.end()) @@ -96,7 +91,6 @@ void SAL_CALL NameContainer::removeByName( const OUString& Name ) // XNameReplace void SAL_CALL NameContainer::replaceByName( const OUString& rName, const Any& rElement ) - throw( lang::IllegalArgumentException, container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception ) { tContentMap::iterator aIt( m_aMap.find( rName )); if( aIt == m_aMap.end() ) @@ -106,7 +100,6 @@ void SAL_CALL NameContainer::replaceByName( const OUString& rName, const Any& rE // XNameAccess Any SAL_CALL NameContainer::getByName( const OUString& rName ) - throw( container::NoSuchElementException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { tContentMap::iterator aIter( m_aMap.find( rName ) ); if( aIter == m_aMap.end() ) @@ -115,7 +108,6 @@ Any SAL_CALL NameContainer::getByName( const OUString& rName ) } Sequence< OUString > SAL_CALL NameContainer::getElementNames() - throw( uno::RuntimeException, std::exception ) { sal_Int32 nCount = m_aMap.size(); Sequence< OUString > aSeq(nCount); @@ -126,27 +118,23 @@ Sequence< OUString > SAL_CALL NameContainer::getElementNames() } sal_Bool SAL_CALL NameContainer::hasByName( const OUString& rName ) - throw( uno::RuntimeException, std::exception ) { return ( m_aMap.find( rName ) != m_aMap.end() ); } // XElementAccess sal_Bool SAL_CALL NameContainer::hasElements() - throw( uno::RuntimeException, std::exception ) { return ! m_aMap.empty(); } uno::Type SAL_CALL NameContainer::getElementType() - throw( uno::RuntimeException, std::exception ) { return m_aType; } // XCloneable uno::Reference< util::XCloneable > SAL_CALL NameContainer::createClone() - throw ( uno::RuntimeException, std::exception ) { return uno::Reference< util::XCloneable >( new NameContainer( *this )); } diff --git a/chart2/source/tools/OPropertySet.cxx b/chart2/source/tools/OPropertySet.cxx index 0dcf03c0da1a..30a08c1ad283 100644 --- a/chart2/source/tools/OPropertySet.cxx +++ b/chart2/source/tools/OPropertySet.cxx @@ -70,7 +70,6 @@ OPropertySet::~OPropertySet() {} Any SAL_CALL OPropertySet::queryInterface( const uno::Type& aType ) - throw (uno::RuntimeException, std::exception) { return ::cppu::queryInterface( aType, @@ -86,7 +85,6 @@ Any SAL_CALL OPropertySet::queryInterface( const uno::Type& aType ) // ____ XTypeProvider ____ Sequence< uno::Type > SAL_CALL OPropertySet::getTypes() - throw (uno::RuntimeException, std::exception) { static const Sequence< uno::Type > aTypeList{ cppu::UnoType::get(), @@ -102,7 +100,6 @@ Sequence< uno::Type > SAL_CALL Sequence< sal_Int8 > SAL_CALL OPropertySet::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence(); } @@ -110,8 +107,6 @@ Sequence< sal_Int8 > SAL_CALL // ____ XPropertyState ____ beans::PropertyState SAL_CALL OPropertySet::getPropertyState( const OUString& PropertyName ) - throw (beans::UnknownPropertyException, - uno::RuntimeException, std::exception) { cppu::IPropertyArrayHelper & rPH = getInfoHelper(); @@ -121,8 +116,6 @@ beans::PropertyState SAL_CALL Sequence< beans::PropertyState > SAL_CALL OPropertySet::getPropertyStates( const Sequence< OUString >& aPropertyName ) - throw (beans::UnknownPropertyException, - uno::RuntimeException, std::exception) { cppu::IPropertyArrayHelper & rPH = getInfoHelper(); @@ -137,8 +130,6 @@ Sequence< beans::PropertyState > SAL_CALL void SAL_CALL OPropertySet::setPropertyToDefault( const OUString& PropertyName ) - throw (beans::UnknownPropertyException, - uno::RuntimeException, std::exception) { cppu::IPropertyArrayHelper & rPH = getInfoHelper(); @@ -148,9 +139,6 @@ void SAL_CALL Any SAL_CALL OPropertySet::getPropertyDefault( const OUString& aPropertyName ) - throw (beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { cppu::IPropertyArrayHelper & rPH = getInfoHelper(); @@ -164,7 +152,6 @@ Any SAL_CALL void SAL_CALL OPropertySet::setAllPropertiesToDefault() - throw (uno::RuntimeException, std::exception) { m_pImplProperties->SetAllPropertiesToDefault(); firePropertyChangeEvent(); @@ -172,8 +159,6 @@ void SAL_CALL void SAL_CALL OPropertySet::setPropertiesToDefault( const Sequence< OUString >& aPropertyNames ) - throw (beans::UnknownPropertyException, - uno::RuntimeException, std::exception) { cppu::IPropertyArrayHelper & rPH = getInfoHelper(); @@ -188,9 +173,6 @@ void SAL_CALL Sequence< Any > SAL_CALL OPropertySet::getPropertyDefaults( const Sequence< OUString >& aPropertyNames ) - throw (beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { ::cppu::IPropertyArrayHelper & rPH = getInfoHelper(); const sal_Int32 nElements = aPropertyNames.getLength(); @@ -213,7 +195,6 @@ sal_Bool SAL_CALL OPropertySet::convertFastPropertyValue Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) - throw (lang::IllegalArgumentException) { getFastPropertyValue( rOldValue, nHandle ); //accept longs also for short values @@ -245,7 +226,6 @@ sal_Bool SAL_CALL OPropertySet::convertFastPropertyValue void SAL_CALL OPropertySet::setFastPropertyValue_NoBroadcast ( sal_Int32 nHandle, const Any& rValue ) - throw (uno::Exception, std::exception) { #if OSL_DEBUG_LEVEL > 0 if( rValue.hasValue()) @@ -359,14 +339,11 @@ void OPropertySet::firePropertyChangeEvent() // ____ XStyleSupplier ____ Reference< style::XStyle > SAL_CALL OPropertySet::getStyle() - throw (uno::RuntimeException, std::exception) { return m_pImplProperties->GetStyle(); } void SAL_CALL OPropertySet::setStyle( const Reference< style::XStyle >& xStyle ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { if( ! m_pImplProperties->SetStyle( xStyle )) throw lang::IllegalArgumentException( @@ -378,10 +355,6 @@ void SAL_CALL OPropertySet::setStyle( const Reference< style::XStyle >& xStyle ) // ____ XMultiPropertySet ____ void SAL_CALL OPropertySet::setPropertyValues( const Sequence< OUString >& PropertyNames, const Sequence< Any >& Values ) - throw(beans::PropertyVetoException, - lang::IllegalArgumentException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { ::cppu::OPropertySetHelper::setPropertyValues( PropertyNames, Values ); @@ -390,10 +363,6 @@ void SAL_CALL OPropertySet::setPropertyValues( // ____ XFastPropertySet ____ void SAL_CALL OPropertySet::setFastPropertyValue( sal_Int32 nHandle, const Any& rValue ) - throw(beans::UnknownPropertyException, - beans::PropertyVetoException, - lang::IllegalArgumentException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { ::cppu::OPropertySetHelper::setFastPropertyValue( nHandle, rValue ); diff --git a/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx b/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx index ef3ba7eb3014..2846dbecba09 100644 --- a/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/PolynomialRegressionCurveCalculator.cxx @@ -42,7 +42,6 @@ PolynomialRegressionCurveCalculator::~PolynomialRegressionCurveCalculator() void SAL_CALL PolynomialRegressionCurveCalculator::recalculateRegression( const uno::Sequence< double >& aXValues, const uno::Sequence< double >& aYValues ) - throw (uno::RuntimeException, std::exception) { rtl::math::setNan(&m_fCorrelationCoeffitient); @@ -199,8 +198,6 @@ void SAL_CALL PolynomialRegressionCurveCalculator::recalculateRegression( } double SAL_CALL PolynomialRegressionCurveCalculator::getCurveValue( double x ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { double fResult; rtl::math::setNan(&fResult); diff --git a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx index 512b3736cfaa..90a542af26d9 100644 --- a/chart2/source/tools/PotentialRegressionCurveCalculator.cxx +++ b/chart2/source/tools/PotentialRegressionCurveCalculator.cxx @@ -46,7 +46,6 @@ PotentialRegressionCurveCalculator::~PotentialRegressionCurveCalculator() void SAL_CALL PotentialRegressionCurveCalculator::recalculateRegression( const uno::Sequence< double >& aXValues, const uno::Sequence< double >& aYValues ) - throw (uno::RuntimeException, std::exception) { RegressionCalculationHelper::tDoubleVectorPair aValues( RegressionCalculationHelper::cleanup( @@ -102,8 +101,6 @@ void SAL_CALL PotentialRegressionCurveCalculator::recalculateRegression( } double SAL_CALL PotentialRegressionCurveCalculator::getCurveValue( double x ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { double fResult; ::rtl::math::setNan( & fResult ); @@ -122,8 +119,6 @@ uno::Sequence< geometry::RealPoint2D > SAL_CALL PotentialRegressionCurveCalculat const uno::Reference< chart2::XScaling >& xScalingX, const uno::Reference< chart2::XScaling >& xScalingY, sal_Bool bMaySkipPointsInCalculation ) - throw (lang::IllegalArgumentException, - uno::RuntimeException, std::exception) { if( bMaySkipPointsInCalculation && isLogarithmicScaling( xScalingX ) && diff --git a/chart2/source/tools/RangeHighlighter.cxx b/chart2/source/tools/RangeHighlighter.cxx index 6bc788ec8b9e..13c107a6d2b2 100644 --- a/chart2/source/tools/RangeHighlighter.cxx +++ b/chart2/source/tools/RangeHighlighter.cxx @@ -75,7 +75,6 @@ RangeHighlighter::~RangeHighlighter() // ____ XRangeHighlighter ____ Sequence< chart2::data::HighlightedRange > SAL_CALL RangeHighlighter::getSelectedRanges() - throw (uno::RuntimeException, std::exception) { return m_aSelectedRanges; } @@ -299,7 +298,6 @@ void RangeHighlighter::fillRangesForDataPoint( const Reference< uno::XInterface } void SAL_CALL RangeHighlighter::addSelectionChangeListener( const Reference< view::XSelectionChangeListener >& xListener ) - throw (uno::RuntimeException, std::exception) { if(!xListener.is()) return; @@ -315,7 +313,6 @@ void SAL_CALL RangeHighlighter::addSelectionChangeListener( const Reference< vie } void SAL_CALL RangeHighlighter::removeSelectionChangeListener( const Reference< view::XSelectionChangeListener >& xListener ) - throw (uno::RuntimeException, std::exception) { rBHelper.removeListener( cppu::UnoType::get(), xListener ); --m_nAddedListenerCount; @@ -325,7 +322,6 @@ void SAL_CALL RangeHighlighter::removeSelectionChangeListener( const Reference< // ____ XSelectionChangeListener ____ void SAL_CALL RangeHighlighter::selectionChanged( const lang::EventObject& /*aEvent*/ ) - throw (uno::RuntimeException, std::exception) { determineRanges(); @@ -352,7 +348,6 @@ void RangeHighlighter::fireSelectionEvent() } void SAL_CALL RangeHighlighter::disposing( const lang::EventObject& Source ) - throw (uno::RuntimeException, std::exception) { if( Source.Source == m_xSelectionSupplier ) { diff --git a/chart2/source/tools/RegressionCurveCalculator.cxx b/chart2/source/tools/RegressionCurveCalculator.cxx index 429eeb002121..5174b3d79ffc 100644 --- a/chart2/source/tools/RegressionCurveCalculator.cxx +++ b/chart2/source/tools/RegressionCurveCalculator.cxx @@ -77,7 +77,6 @@ void RegressionCurveCalculator::setRegressionProperties( sal_Bool aForceIntercept, double aInterceptValue, sal_Int32 aPeriod ) - throw (uno::RuntimeException, std::exception) { mDegree = aDegree; mForceIntercept = aForceIntercept; @@ -136,7 +135,6 @@ Sequence< geometry::RealPoint2D > SAL_CALL RegressionCurveCalculator::getCurveVa const Reference< chart2::XScaling >& xScalingX, const Reference< chart2::XScaling >& /* xScalingY */, sal_Bool /* bMaySkipPointsInCalculation */ ) - throw (lang::IllegalArgumentException, uno::RuntimeException, std::exception) { if( nPointCount < 2 ) throw lang::IllegalArgumentException(); @@ -172,13 +170,11 @@ Sequence< geometry::RealPoint2D > SAL_CALL RegressionCurveCalculator::getCurveVa } double SAL_CALL RegressionCurveCalculator::getCorrelationCoefficient() - throw (uno::RuntimeException, std::exception) { return m_fCorrelationCoeffitient; } OUString SAL_CALL RegressionCurveCalculator::getRepresentation() - throw (uno::RuntimeException, std::exception) { return ImplGetRepresentation( Reference< util::XNumberFormatter >(), 0 ); } @@ -186,7 +182,6 @@ OUString SAL_CALL RegressionCurveCalculator::getRepresentation() OUString SAL_CALL RegressionCurveCalculator::getFormattedRepresentation( const Reference< util::XNumberFormatsSupplier > & xNumFmtSupplier, sal_Int32 nNumberFormatKey, sal_Int32 nFormulaLength ) -throw (uno::RuntimeException, std::exception) { // create and prepare a number formatter if( !xNumFmtSupplier.is()) @@ -213,7 +208,6 @@ void RegressionCurveCalculator::addStringToEquation( } void SAL_CALL RegressionCurveCalculator::setXYNames( const OUString& aXName, const OUString& aYName ) - throw (uno::RuntimeException, std::exception) { if ( aXName.isEmpty() ) mXName = OUString ("x"); diff --git a/chart2/source/tools/RegressionCurveModel.cxx b/chart2/source/tools/RegressionCurveModel.cxx index bce0d5064e1f..bbfa82b2e689 100644 --- a/chart2/source/tools/RegressionCurveModel.cxx +++ b/chart2/source/tools/RegressionCurveModel.cxx @@ -206,19 +206,16 @@ RegressionCurveModel::~RegressionCurveModel() // ____ XRegressionCurve ____ uno::Reference< chart2::XRegressionCurveCalculator > SAL_CALL RegressionCurveModel::getCalculator() - throw (uno::RuntimeException, std::exception) { return RegressionCurveHelper::createRegressionCurveCalculatorByServiceName( getServiceName()); } uno::Reference< beans::XPropertySet > SAL_CALL RegressionCurveModel::getEquationProperties() - throw (uno::RuntimeException, std::exception) { return m_xEquationProperties; } void SAL_CALL RegressionCurveModel::setEquationProperties( const uno::Reference< beans::XPropertySet >& xEquationProperties ) - throw (uno::RuntimeException, std::exception) { if( xEquationProperties.is()) { @@ -233,7 +230,6 @@ void SAL_CALL RegressionCurveModel::setEquationProperties( const uno::Reference< // ____ XServiceName ____ OUString SAL_CALL RegressionCurveModel::getServiceName() - throw (uno::RuntimeException, std::exception) { switch( m_eRegressionCurveType ) { @@ -258,7 +254,6 @@ OUString SAL_CALL RegressionCurveModel::getServiceName() // ____ XModifyBroadcaster ____ void SAL_CALL RegressionCurveModel::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -272,7 +267,6 @@ void SAL_CALL RegressionCurveModel::addModifyListener( const uno::Reference< uti } void SAL_CALL RegressionCurveModel::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -287,14 +281,12 @@ void SAL_CALL RegressionCurveModel::removeModifyListener( const uno::Reference< // ____ XModifyListener ____ void SAL_CALL RegressionCurveModel::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { m_xModifyEventForwarder->modified( aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL RegressionCurveModel::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException, std::exception) { // nothing } @@ -312,7 +304,6 @@ void RegressionCurveModel::fireModifyEvent() // ____ OPropertySet ____ uno::Any RegressionCurveModel::GetDefaultValue( sal_Int32 nHandle ) const - throw(beans::UnknownPropertyException) { const tPropertyValueMap& rStaticDefaults = *StaticXXXDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -328,7 +319,6 @@ uno::Any RegressionCurveModel::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ uno::Reference< beans::XPropertySetInfo > SAL_CALL RegressionCurveModel::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticRegressionCurveInfo::get(); } @@ -352,25 +342,21 @@ MeanValueRegressionCurve::~MeanValueRegressionCurve() {} OUString SAL_CALL MeanValueRegressionCurve::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return lcl_aImplementationName_MeanValue; } sal_Bool SAL_CALL MeanValueRegressionCurve::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL MeanValueRegressionCurve::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName, "com.sun.star.chart2.MeanValueRegressionCurve" }; } uno::Reference< util::XCloneable > SAL_CALL MeanValueRegressionCurve::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new MeanValueRegressionCurve( *this )); } @@ -386,25 +372,21 @@ LinearRegressionCurve::~LinearRegressionCurve() {} OUString SAL_CALL LinearRegressionCurve::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return lcl_aImplementationName_Linear; } sal_Bool SAL_CALL LinearRegressionCurve::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL LinearRegressionCurve::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName, "com.sun.star.chart2.LinearRegressionCurve" }; } uno::Reference< util::XCloneable > SAL_CALL LinearRegressionCurve::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new LinearRegressionCurve( *this )); } @@ -420,25 +402,21 @@ LogarithmicRegressionCurve::~LogarithmicRegressionCurve() {} OUString SAL_CALL LogarithmicRegressionCurve::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return lcl_aImplementationName_Logarithmic; } sal_Bool SAL_CALL LogarithmicRegressionCurve::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL LogarithmicRegressionCurve::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName, "com.sun.star.chart2.LogarithmicRegressionCurve" }; } uno::Reference< util::XCloneable > SAL_CALL LogarithmicRegressionCurve::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new LogarithmicRegressionCurve( *this )); } @@ -454,25 +432,21 @@ ExponentialRegressionCurve::~ExponentialRegressionCurve() {} OUString SAL_CALL ExponentialRegressionCurve::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return lcl_aImplementationName_Exponential; } sal_Bool SAL_CALL ExponentialRegressionCurve::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL ExponentialRegressionCurve::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName, "com.sun.star.chart2.ExponentialRegressionCurve" }; } uno::Reference< util::XCloneable > SAL_CALL ExponentialRegressionCurve::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new ExponentialRegressionCurve( *this )); } @@ -488,25 +462,21 @@ PotentialRegressionCurve::~PotentialRegressionCurve() {} OUString SAL_CALL PotentialRegressionCurve::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return lcl_aImplementationName_Potential; } sal_Bool SAL_CALL PotentialRegressionCurve::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL PotentialRegressionCurve::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName, "com.sun.star.chart2.PotentialRegressionCurve" }; } uno::Reference< util::XCloneable > SAL_CALL PotentialRegressionCurve::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new PotentialRegressionCurve( *this )); } @@ -522,25 +492,21 @@ PolynomialRegressionCurve::~PolynomialRegressionCurve() {} OUString SAL_CALL PolynomialRegressionCurve::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return lcl_aImplementationName_Polynomial; } sal_Bool SAL_CALL PolynomialRegressionCurve::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL PolynomialRegressionCurve::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName, "com.sun.star.chart2.PolynomialRegressionCurve" }; } uno::Reference< util::XCloneable > SAL_CALL PolynomialRegressionCurve::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new PolynomialRegressionCurve( *this )); } @@ -556,25 +522,21 @@ MovingAverageRegressionCurve::~MovingAverageRegressionCurve() {} OUString SAL_CALL MovingAverageRegressionCurve::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return lcl_aImplementationName_MovingAverage; } sal_Bool SAL_CALL MovingAverageRegressionCurve::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL MovingAverageRegressionCurve::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName, "com.sun.star.chart2.MovingAverageRegressionCurve" }; } uno::Reference< util::XCloneable > SAL_CALL MovingAverageRegressionCurve::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new MovingAverageRegressionCurve( *this )); } diff --git a/chart2/source/tools/RegressionCurveModel.hxx b/chart2/source/tools/RegressionCurveModel.hxx index 4e7191a04177..3f9b6cbb46f5 100644 --- a/chart2/source/tools/RegressionCurveModel.hxx +++ b/chart2/source/tools/RegressionCurveModel.hxx @@ -76,47 +76,37 @@ public: protected: // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw(css::beans::UnknownPropertyException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; // ____ OPropertySet ____ virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XRegressionCurve ____ - virtual css::uno::Reference< css::chart2::XRegressionCurveCalculator > SAL_CALL getCalculator() - throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getEquationProperties() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::chart2::XRegressionCurveCalculator > SAL_CALL getCalculator() override; + virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getEquationProperties() override; virtual void SAL_CALL setEquationProperties( - const css::uno::Reference< css::beans::XPropertySet >& xEquationProperties ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertySet >& xEquationProperties ) override; // ____ XServiceName ____ - virtual OUString SAL_CALL getServiceName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // ____ XModifyListener ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; using ::cppu::OPropertySetHelper::disposing; @@ -143,16 +133,12 @@ public: virtual ~MeanValueRegressionCurve() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; class LinearRegressionCurve : public RegressionCurveModel @@ -163,16 +149,12 @@ public: virtual ~LinearRegressionCurve() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; class LogarithmicRegressionCurve : public RegressionCurveModel @@ -183,16 +165,12 @@ public: virtual ~LogarithmicRegressionCurve() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; class ExponentialRegressionCurve : public RegressionCurveModel @@ -203,16 +181,12 @@ public: virtual ~ExponentialRegressionCurve() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; class PotentialRegressionCurve : public RegressionCurveModel @@ -223,16 +197,12 @@ public: virtual ~PotentialRegressionCurve() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; class PolynomialRegressionCurve : public RegressionCurveModel @@ -243,16 +213,12 @@ public: virtual ~PolynomialRegressionCurve() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; class MovingAverageRegressionCurve : public RegressionCurveModel @@ -263,16 +229,12 @@ public: virtual ~MovingAverageRegressionCurve() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; /// XServiceInfo declarations - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; } // namespace chart diff --git a/chart2/source/tools/RegressionEquation.cxx b/chart2/source/tools/RegressionEquation.cxx index ce759a3fb68f..ab13afc027a1 100644 --- a/chart2/source/tools/RegressionEquation.cxx +++ b/chart2/source/tools/RegressionEquation.cxx @@ -212,14 +212,12 @@ RegressionEquation::~RegressionEquation() // ____ XCloneable ____ uno::Reference< util::XCloneable > SAL_CALL RegressionEquation::createClone() - throw (uno::RuntimeException, std::exception) { return uno::Reference< util::XCloneable >( new RegressionEquation( *this )); } // ____ OPropertySet ____ uno::Any RegressionEquation::GetDefaultValue( sal_Int32 nHandle ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) { const tPropertyValueMap& rStaticDefaults = *StaticRegressionEquationDefaults::get(); tPropertyValueMap::const_iterator aFound( rStaticDefaults.find( nHandle ) ); @@ -235,14 +233,12 @@ uno::Any RegressionEquation::GetDefaultValue( sal_Int32 nHandle ) const // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL RegressionEquation::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { return *StaticRegressionEquationInfo::get(); } // ____ XModifyBroadcaster ____ void SAL_CALL RegressionEquation::addModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -256,7 +252,6 @@ void SAL_CALL RegressionEquation::addModifyListener( const uno::Reference< util: } void SAL_CALL RegressionEquation::removeModifyListener( const uno::Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -271,14 +266,12 @@ void SAL_CALL RegressionEquation::removeModifyListener( const uno::Reference< ut // ____ XModifyListener ____ void SAL_CALL RegressionEquation::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { m_xModifyEventForwarder->modified( aEvent ); } // ____ XEventListener (base of XModifyListener) ____ void SAL_CALL RegressionEquation::disposing( const lang::EventObject& /* Source */ ) - throw (uno::RuntimeException, std::exception) { // nothing } @@ -296,14 +289,12 @@ void RegressionEquation::fireModifyEvent() // ____ XTitle ____ uno::Sequence< uno::Reference< chart2::XFormattedString > > SAL_CALL RegressionEquation::getText() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); return m_aStrings; } void SAL_CALL RegressionEquation::setText( const uno::Sequence< uno::Reference< chart2::XFormattedString > >& Strings ) - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); ModifyListenerHelper::removeListenerFromAllElements( @@ -315,19 +306,16 @@ void SAL_CALL RegressionEquation::setText( const uno::Sequence< uno::Reference< } OUString SAL_CALL RegressionEquation::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.chart2.RegressionEquation"); } sal_Bool SAL_CALL RegressionEquation::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL RegressionEquation::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { "com.sun.star.chart2.RegressionEquation", "com.sun.star.beans.PropertySet", diff --git a/chart2/source/tools/RegressionEquation.hxx b/chart2/source/tools/RegressionEquation.hxx index 6dcdd605f2d8..e018061f8f33 100644 --- a/chart2/source/tools/RegressionEquation.hxx +++ b/chart2/source/tools/RegressionEquation.hxx @@ -58,15 +58,12 @@ public: virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; /// merge XInterface implementations @@ -76,47 +73,37 @@ protected: explicit RegressionEquation( const RegressionEquation & rOther ); // ____ OPropertySet ____ - virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const - throw (css::beans::UnknownPropertyException, - css::uno::RuntimeException) override; + virtual css::uno::Any GetDefaultValue( sal_Int32 nHandle ) const override; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() override; // ____ XPropertySet ____ virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL - getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getPropertySetInfo() override; // ____ XCloneable ____ - virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::util::XCloneable > SAL_CALL createClone() override; // ____ XModifyBroadcaster ____ virtual void SAL_CALL addModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; virtual void SAL_CALL removeModifyListener( - const css::uno::Reference< css::util::XModifyListener >& aListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::util::XModifyListener >& aListener ) override; // ____ XModifyListener ____ virtual void SAL_CALL modified( - const css::lang::EventObject& aEvent ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& aEvent ) override; // ____ XEventListener (base of XModifyListener) ____ virtual void SAL_CALL disposing( - const css::lang::EventObject& Source ) - throw (css::uno::RuntimeException, std::exception) override; + const css::lang::EventObject& Source ) override; // ____ XTitle ____ virtual css::uno::Sequence< - css::uno::Reference< css::chart2::XFormattedString > > SAL_CALL getText() - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::chart2::XFormattedString > > SAL_CALL getText() override; virtual void SAL_CALL setText( const css::uno::Sequence< css::uno::Reference< - css::chart2::XFormattedString > >& Strings ) - throw (css::uno::RuntimeException, std::exception) override; + css::chart2::XFormattedString > >& Strings ) override; using ::cppu::OPropertySetHelper::disposing; diff --git a/chart2/source/tools/Scaling.cxx b/chart2/source/tools/Scaling.cxx index 83084b9126ae..9edd475afdcb 100644 --- a/chart2/source/tools/Scaling.cxx +++ b/chart2/source/tools/Scaling.cxx @@ -54,7 +54,6 @@ LogarithmicScaling::~LogarithmicScaling() } double SAL_CALL LogarithmicScaling::doScaling( double value ) - throw (uno::RuntimeException, std::exception) { double fResult; if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) ) @@ -65,31 +64,26 @@ double SAL_CALL LogarithmicScaling::doScaling( double value ) } uno::Reference< XScaling > SAL_CALL LogarithmicScaling::getInverseScaling() - throw (uno::RuntimeException, std::exception) { return new ExponentialScaling( m_fBase ); } OUString SAL_CALL LogarithmicScaling::getServiceName() - throw (uno::RuntimeException, std::exception) { return OUString(lcl_aServiceName_Logarithmic); } OUString SAL_CALL LogarithmicScaling::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString(lcl_aServiceName_Logarithmic); } sal_Bool SAL_CALL LogarithmicScaling::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL LogarithmicScaling::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName_Logarithmic }; } @@ -109,7 +103,6 @@ ExponentialScaling::~ExponentialScaling() } double SAL_CALL ExponentialScaling::doScaling( double value ) - throw (uno::RuntimeException, std::exception) { double fResult; if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) ) @@ -120,31 +113,26 @@ double SAL_CALL ExponentialScaling::doScaling( double value ) } uno::Reference< XScaling > SAL_CALL ExponentialScaling::getInverseScaling() - throw (uno::RuntimeException, std::exception) { return new LogarithmicScaling( m_fBase ); } OUString SAL_CALL ExponentialScaling::getServiceName() - throw (uno::RuntimeException, std::exception) { return OUString(lcl_aServiceName_Exponential); } OUString SAL_CALL ExponentialScaling::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString(lcl_aServiceName_Exponential); } sal_Bool SAL_CALL ExponentialScaling::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL ExponentialScaling::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName_Exponential }; } @@ -163,7 +151,6 @@ LinearScaling::~LinearScaling() {} double SAL_CALL LinearScaling::doScaling( double value ) - throw (uno::RuntimeException, std::exception) { double fResult; if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) ) @@ -175,7 +162,6 @@ double SAL_CALL LinearScaling::doScaling( double value ) uno::Reference< XScaling > SAL_CALL LinearScaling::getInverseScaling() - throw (uno::RuntimeException, std::exception) { // ToDo: ApproxEqual ? if( m_fSlope == 0 ) @@ -185,25 +171,21 @@ uno::Reference< XScaling > SAL_CALL } OUString SAL_CALL LinearScaling::getServiceName() - throw (uno::RuntimeException, std::exception) { return OUString(lcl_aServiceName_Linear); } OUString SAL_CALL LinearScaling::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString(lcl_aServiceName_Linear) ; } sal_Bool SAL_CALL LinearScaling::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL LinearScaling::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName_Linear }; } @@ -220,7 +202,6 @@ PowerScaling::~PowerScaling() {} double SAL_CALL PowerScaling::doScaling( double value ) - throw (uno::RuntimeException, std::exception) { double fResult; if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) ) @@ -232,7 +213,6 @@ double SAL_CALL PowerScaling::doScaling( double value ) uno::Reference< XScaling > SAL_CALL PowerScaling::getInverseScaling() - throw (uno::RuntimeException, std::exception) { // ToDo: ApproxEqual ? if( m_fExponent == 0 ) @@ -243,25 +223,21 @@ uno::Reference< XScaling > SAL_CALL OUString SAL_CALL PowerScaling::getServiceName() - throw (uno::RuntimeException, std::exception) { return OUString(lcl_aServiceName_Power); } OUString SAL_CALL PowerScaling::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString(lcl_aServiceName_Power); } sal_Bool SAL_CALL PowerScaling::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL PowerScaling::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName_Power }; } diff --git a/chart2/source/tools/UncachedDataSequence.cxx b/chart2/source/tools/UncachedDataSequence.cxx index 67a99d72c361..c4d7290d6fee 100644 --- a/chart2/source/tools/UncachedDataSequence.cxx +++ b/chart2/source/tools/UncachedDataSequence.cxx @@ -125,7 +125,6 @@ IMPLEMENT_FORWARD_XTYPEPROVIDER2( UncachedDataSequence, UncachedDataSequence_Bas // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL UncachedDataSequence::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { return Reference< beans::XPropertySetInfo >( createPropertySetInfo( getInfoHelper() ) ); } @@ -147,19 +146,16 @@ Reference< beans::XPropertySetInfo > SAL_CALL UncachedDataSequence::getPropertyS } OUString SAL_CALL UncachedDataSequence::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString(lcl_aServiceName); } sal_Bool SAL_CALL UncachedDataSequence::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL UncachedDataSequence::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName, @@ -171,7 +167,6 @@ css::uno::Sequence< OUString > SAL_CALL UncachedDataSequence::getSupportedServic // ________ XNumericalDataSequence ________ Sequence< double > SAL_CALL UncachedDataSequence::getNumericalData() - throw (uno::RuntimeException, std::exception) { Sequence< double > aResult; MutexGuard aGuard( GetMutex() ); @@ -187,7 +182,6 @@ Sequence< double > SAL_CALL UncachedDataSequence::getNumericalData() // ________ XTextualDataSequence ________ Sequence< OUString > SAL_CALL UncachedDataSequence::getTextualData() - throw (uno::RuntimeException, std::exception) { Sequence< OUString > aResult; MutexGuard aGuard( GetMutex() ); @@ -203,7 +197,6 @@ Sequence< OUString > SAL_CALL UncachedDataSequence::getTextualData() // ________ XDataSequence ________ Sequence< Any > SAL_CALL UncachedDataSequence::getData() - throw (uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); if( m_xDataProvider.is()) @@ -212,31 +205,23 @@ Sequence< Any > SAL_CALL UncachedDataSequence::getData() } OUString SAL_CALL UncachedDataSequence::getSourceRangeRepresentation() - throw (uno::RuntimeException, std::exception) { return getName(); } Sequence< OUString > SAL_CALL UncachedDataSequence::generateLabel( chart2::data::LabelOrigin ) - throw (uno::RuntimeException, std::exception) { // auto-generated label is an empty string return Sequence< OUString >(1); } ::sal_Int32 SAL_CALL UncachedDataSequence::getNumberFormatKeyByIndex( ::sal_Int32 ) - throw (lang::IndexOutOfBoundsException, - uno::RuntimeException, std::exception) { return m_nNumberFormatKey; } // ____ XIndexReplace ____ void SAL_CALL UncachedDataSequence::replaceByIndex( ::sal_Int32 Index, const uno::Any& Element ) - throw (lang::IllegalArgumentException, - lang::IndexOutOfBoundsException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { MutexGuard aGuard( GetMutex() ); Sequence< Any > aData( getData()); @@ -251,16 +236,12 @@ void SAL_CALL UncachedDataSequence::replaceByIndex( ::sal_Int32 Index, const uno // ____ XIndexAccess (base of XIndexReplace) ____ ::sal_Int32 SAL_CALL UncachedDataSequence::getCount() - throw (uno::RuntimeException, std::exception) { OSL_FAIL( "Implement!" ); return 0; } uno::Any SAL_CALL UncachedDataSequence::getByIndex( ::sal_Int32 ) - throw (lang::IndexOutOfBoundsException, - lang::WrappedTargetException, - uno::RuntimeException, std::exception) { OSL_FAIL( "Implement!" ); return uno::Any(); @@ -268,13 +249,11 @@ uno::Any SAL_CALL UncachedDataSequence::getByIndex( ::sal_Int32 ) // ____ XElementAccess (base of XIndexAccess) ____ uno::Type SAL_CALL UncachedDataSequence::getElementType() - throw (uno::RuntimeException, std::exception) { return cppu::UnoType::get(); } sal_Bool SAL_CALL UncachedDataSequence::hasElements() - throw (uno::RuntimeException, std::exception) { if( ! m_xDataProvider.is()) return false; @@ -283,20 +262,17 @@ sal_Bool SAL_CALL UncachedDataSequence::hasElements() // ____ XNamed ____ OUString SAL_CALL UncachedDataSequence::getName() - throw (uno::RuntimeException, std::exception) { return m_aSourceRepresentation; } void SAL_CALL UncachedDataSequence::setName( const OUString& aName ) - throw (uno::RuntimeException, std::exception) { m_aSourceRepresentation = aName; fireModifyEvent(); } Reference< util::XCloneable > SAL_CALL UncachedDataSequence::createClone() - throw (uno::RuntimeException, std::exception) { UncachedDataSequence * pNewSeq = new UncachedDataSequence( *this ); return Reference< util::XCloneable >( pNewSeq ); @@ -304,14 +280,11 @@ Reference< util::XCloneable > SAL_CALL UncachedDataSequence::createClone() // ____ XModifiable ____ sal_Bool SAL_CALL UncachedDataSequence::isModified() - throw (uno::RuntimeException, std::exception) { return false; } void SAL_CALL UncachedDataSequence::setModified( sal_Bool bModified ) - throw (beans::PropertyVetoException, - uno::RuntimeException, std::exception) { if( bModified ) fireModifyEvent(); @@ -319,7 +292,6 @@ void SAL_CALL UncachedDataSequence::setModified( sal_Bool bModified ) // ____ XModifyBroadcaster (base of XModifiable) ____ void SAL_CALL UncachedDataSequence::addModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { @@ -333,7 +305,6 @@ void SAL_CALL UncachedDataSequence::addModifyListener( const Reference< util::XM } void SAL_CALL UncachedDataSequence::removeModifyListener( const Reference< util::XModifyListener >& aListener ) - throw (uno::RuntimeException, std::exception) { try { diff --git a/chart2/source/tools/WeakListenerAdapter.cxx b/chart2/source/tools/WeakListenerAdapter.cxx index 6a1b014a418d..12c616f2f72f 100644 --- a/chart2/source/tools/WeakListenerAdapter.cxx +++ b/chart2/source/tools/WeakListenerAdapter.cxx @@ -35,7 +35,6 @@ WeakModifyListenerAdapter::~WeakModifyListenerAdapter() {} void SAL_CALL WeakModifyListenerAdapter::modified( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { Reference< util::XModifyListener > xModListener( getListener() ); if( xModListener.is()) @@ -51,7 +50,6 @@ WeakSelectionChangeListenerAdapter::~WeakSelectionChangeListenerAdapter() {} void SAL_CALL WeakSelectionChangeListenerAdapter::selectionChanged( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { Reference< view::XSelectionChangeListener > xSelChgListener( getListener() ); if( xSelChgListener.is()) diff --git a/chart2/source/tools/WrappedDefaultProperty.cxx b/chart2/source/tools/WrappedDefaultProperty.cxx index b9ef06dcf4a1..ef74d61e9dee 100644 --- a/chart2/source/tools/WrappedDefaultProperty.cxx +++ b/chart2/source/tools/WrappedDefaultProperty.cxx @@ -39,8 +39,6 @@ WrappedDefaultProperty::~WrappedDefaultProperty() void WrappedDefaultProperty::setPropertyToDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, - uno::RuntimeException) { Reference< beans::XPropertySet > xInnerPropSet( xInnerPropertyState, uno::UNO_QUERY ); if( xInnerPropSet.is()) @@ -49,17 +47,12 @@ void WrappedDefaultProperty::setPropertyToDefault( uno::Any WrappedDefaultProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /* xInnerPropertyState */ ) const - throw (beans::UnknownPropertyException, - lang::WrappedTargetException, - uno::RuntimeException) { return m_aOuterDefaultValue; } beans::PropertyState WrappedDefaultProperty::getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, - uno::RuntimeException) { beans::PropertyState aState = beans::PropertyState_DIRECT_VALUE; try diff --git a/chart2/source/tools/WrappedDirectStateProperty.cxx b/chart2/source/tools/WrappedDirectStateProperty.cxx index ceef3bfc79cf..34941778926f 100644 --- a/chart2/source/tools/WrappedDirectStateProperty.cxx +++ b/chart2/source/tools/WrappedDirectStateProperty.cxx @@ -37,8 +37,6 @@ WrappedDirectStateProperty::~WrappedDirectStateProperty() beans::PropertyState WrappedDirectStateProperty::getPropertyState( const Reference< beans::XPropertyState >& /* xInnerPropertyState */ ) const - throw (beans::UnknownPropertyException, - uno::RuntimeException) { return beans::PropertyState_DIRECT_VALUE; } diff --git a/chart2/source/tools/WrappedIgnoreProperty.cxx b/chart2/source/tools/WrappedIgnoreProperty.cxx index 6ac89266bd20..5a0cdef9a61c 100644 --- a/chart2/source/tools/WrappedIgnoreProperty.cxx +++ b/chart2/source/tools/WrappedIgnoreProperty.cxx @@ -46,31 +46,26 @@ WrappedIgnoreProperty::~WrappedIgnoreProperty() } void WrappedIgnoreProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& /* xInnerPropertySet */ ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { m_aCurrentValue = rOuterValue; } Any WrappedIgnoreProperty::getPropertyValue( const Reference< beans::XPropertySet >& /* xInnerPropertySet */ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return m_aCurrentValue; } void WrappedIgnoreProperty::setPropertyToDefault( const Reference< beans::XPropertyState >& /* xInnerPropertyState */ ) const - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) { m_aCurrentValue = m_aDefaultValue; } Any WrappedIgnoreProperty::getPropertyDefault( const Reference< beans::XPropertyState >& /* xInnerPropertyState */ ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { return m_aDefaultValue; } beans::PropertyState WrappedIgnoreProperty::getPropertyState( const Reference< beans::XPropertyState >& /* xInnerPropertyState */ ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) { return ( m_aCurrentValue == m_aDefaultValue ? beans::PropertyState_DEFAULT_VALUE diff --git a/chart2/source/tools/WrappedProperty.cxx b/chart2/source/tools/WrappedProperty.cxx index c664a6ae92ea..0b7c93c70dc6 100644 --- a/chart2/source/tools/WrappedProperty.cxx +++ b/chart2/source/tools/WrappedProperty.cxx @@ -52,14 +52,12 @@ Any WrappedProperty::convertOuterToInnerValue( const Any& rOuterValue ) const } void WrappedProperty::setPropertyValue( const Any& rOuterValue, const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException) { if(xInnerPropertySet.is()) xInnerPropertySet->setPropertyValue( this->getInnerName(), this->convertOuterToInnerValue( rOuterValue ) ); } Any WrappedProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; if( xInnerPropertySet.is() ) @@ -71,7 +69,6 @@ Any WrappedProperty::getPropertyValue( const Reference< beans::XPropertySet >& x } void WrappedProperty::setPropertyToDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException) { if( xInnerPropertyState.is() && !this->getInnerName().isEmpty() ) xInnerPropertyState->setPropertyToDefault(this->getInnerName()); @@ -83,7 +80,6 @@ void WrappedProperty::setPropertyToDefault( const Reference< beans::XPropertySta } Any WrappedProperty::getPropertyDefault( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException) { Any aRet; if( xInnerPropertyState.is() ) @@ -95,7 +91,6 @@ Any WrappedProperty::getPropertyDefault( const Reference< beans::XPropertyState } beans::PropertyState WrappedProperty::getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const - throw (beans::UnknownPropertyException, uno::RuntimeException) { beans::PropertyState aState = beans::PropertyState_DIRECT_VALUE; OUString aInnerName( this->getInnerName() ); diff --git a/chart2/source/tools/WrappedPropertySet.cxx b/chart2/source/tools/WrappedPropertySet.cxx index e7783e201a73..78c86c73852a 100644 --- a/chart2/source/tools/WrappedPropertySet.cxx +++ b/chart2/source/tools/WrappedPropertySet.cxx @@ -70,7 +70,6 @@ void WrappedPropertySet::clearWrappedPropertySet() //XPropertySet Reference< beans::XPropertySetInfo > SAL_CALL WrappedPropertySet::getPropertySetInfo( ) - throw (uno::RuntimeException, std::exception) { Reference< beans::XPropertySetInfo > xInfo = m_xInfo; if( !xInfo.is() ) @@ -92,7 +91,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL WrappedPropertySet::getPropertySet } void SAL_CALL WrappedPropertySet::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { try { @@ -137,7 +135,6 @@ void SAL_CALL WrappedPropertySet::setPropertyValue( const OUString& rPropertyNam } } Any SAL_CALL WrappedPropertySet::getPropertyValue( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Any aRet; @@ -179,7 +176,6 @@ Any SAL_CALL WrappedPropertySet::getPropertyValue( const OUString& rPropertyName } void SAL_CALL WrappedPropertySet::addPropertyChangeListener( const OUString& rPropertyName, const Reference< beans::XPropertyChangeListener >& xListener ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xInnerPropertySet( this->getInnerPropertySet() ); if( xInnerPropertySet.is() ) @@ -192,7 +188,6 @@ void SAL_CALL WrappedPropertySet::addPropertyChangeListener( const OUString& rPr } } void SAL_CALL WrappedPropertySet::removePropertyChangeListener( const OUString& rPropertyName, const Reference< beans::XPropertyChangeListener >& aListener ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xInnerPropertySet( this->getInnerPropertySet() ); if( xInnerPropertySet.is() ) @@ -205,7 +200,6 @@ void SAL_CALL WrappedPropertySet::removePropertyChangeListener( const OUString& } } void SAL_CALL WrappedPropertySet::addVetoableChangeListener( const OUString& rPropertyName, const Reference< beans::XVetoableChangeListener >& aListener ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xInnerPropertySet( this->getInnerPropertySet() ); if( xInnerPropertySet.is() ) @@ -218,7 +212,6 @@ void SAL_CALL WrappedPropertySet::addVetoableChangeListener( const OUString& rPr } } void SAL_CALL WrappedPropertySet::removeVetoableChangeListener( const OUString& rPropertyName, const Reference< beans::XVetoableChangeListener >& aListener ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Reference< beans::XPropertySet > xInnerPropertySet( this->getInnerPropertySet() ); if( xInnerPropertySet.is() ) @@ -233,7 +226,6 @@ void SAL_CALL WrappedPropertySet::removeVetoableChangeListener( const OUString& //XMultiPropertySet void SAL_CALL WrappedPropertySet::setPropertyValues( const Sequence< OUString >& rNameSeq, const Sequence< Any >& rValueSeq ) - throw (beans::PropertyVetoException, lang::IllegalArgumentException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { bool bUnknownProperty = false; sal_Int32 nMinCount = std::min( rValueSeq.getLength(), rNameSeq.getLength() ); @@ -257,7 +249,6 @@ void SAL_CALL WrappedPropertySet::setPropertyValues( const Sequence< OUString >& // throw beans::UnknownPropertyException(); } Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyValues( const Sequence< OUString >& rNameSeq ) - throw (uno::RuntimeException, std::exception) { Sequence< Any > aRetSeq; if( rNameSeq.getLength() ) @@ -283,19 +274,16 @@ Sequence< Any > SAL_CALL WrappedPropertySet::getPropertyValues( const Sequence< return aRetSeq; } void SAL_CALL WrappedPropertySet::addPropertiesChangeListener( const Sequence< OUString >& /* rNameSeq */, const Reference< beans::XPropertiesChangeListener >& /* xListener */ ) - throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented yet"); //todo } void SAL_CALL WrappedPropertySet::removePropertiesChangeListener( const Reference< beans::XPropertiesChangeListener >& /* xListener */ ) - throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented yet"); //todo } void SAL_CALL WrappedPropertySet::firePropertiesChangeEvent( const Sequence< OUString >& /* rNameSeq */, const Reference< beans::XPropertiesChangeListener >& /* xListener */ ) - throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented yet"); //todo @@ -303,7 +291,6 @@ void SAL_CALL WrappedPropertySet::firePropertiesChangeEvent( const Sequence< OUS //XPropertyState beans::PropertyState SAL_CALL WrappedPropertySet::getPropertyState( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { beans::PropertyState aState( beans::PropertyState_DIRECT_VALUE ); @@ -334,7 +321,6 @@ const WrappedProperty* WrappedPropertySet::getWrappedProperty( sal_Int32 nHandle } Sequence< beans::PropertyState > SAL_CALL WrappedPropertySet::getPropertyStates( const Sequence< OUString >& rNameSeq ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { Sequence< beans::PropertyState > aRetSeq; if( rNameSeq.getLength() ) @@ -350,7 +336,6 @@ Sequence< beans::PropertyState > SAL_CALL WrappedPropertySet::getPropertyStates( } void SAL_CALL WrappedPropertySet::setPropertyToDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { Reference< beans::XPropertyState > xInnerPropertyState( this->getInnerPropertyState() ); if( xInnerPropertyState.is() ) @@ -363,7 +348,6 @@ void SAL_CALL WrappedPropertySet::setPropertyToDefault( const OUString& rPropert } } Any SAL_CALL WrappedPropertySet::getPropertyDefault( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Any aRet; Reference< beans::XPropertyState > xInnerPropertyState( this->getInnerPropertyState() ); @@ -380,7 +364,6 @@ Any SAL_CALL WrappedPropertySet::getPropertyDefault( const OUString& rPropertyNa //XMultiPropertyStates void SAL_CALL WrappedPropertySet::setAllPropertiesToDefault( ) - throw (uno::RuntimeException, std::exception) { const Sequence< beans::Property >& rPropSeq = getPropertySequence(); for(sal_Int32 nN=0; nN& rNameSeq ) - throw (beans::UnknownPropertyException, uno::RuntimeException, std::exception) { for(sal_Int32 nN=0; nN SAL_CALL WrappedPropertySet::getPropertyDefaults( const Sequence< OUString >& rNameSeq ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Sequence< Any > aRetSeq; if( rNameSeq.getLength() ) diff --git a/chart2/source/view/axes/DateScaling.cxx b/chart2/source/view/axes/DateScaling.cxx index 2dd8e3427835..0a83e792b818 100644 --- a/chart2/source/view/axes/DateScaling.cxx +++ b/chart2/source/view/axes/DateScaling.cxx @@ -52,7 +52,6 @@ DateScaling::~DateScaling() } double SAL_CALL DateScaling::doScaling( double value ) - throw (uno::RuntimeException, std::exception) { double fResult(value); if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) ) @@ -93,31 +92,26 @@ double SAL_CALL DateScaling::doScaling( double value ) } uno::Reference< XScaling > SAL_CALL DateScaling::getInverseScaling() - throw (uno::RuntimeException, std::exception) { return new InverseDateScaling( m_aNullDate, m_nTimeUnit, m_bShifted ); } OUString SAL_CALL DateScaling::getServiceName() - throw (uno::RuntimeException, std::exception) { return OUString(lcl_aServiceName_DateScaling); } OUString SAL_CALL DateScaling::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString(lcl_aServiceName_DateScaling); } sal_Bool SAL_CALL DateScaling::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL DateScaling::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName_DateScaling }; } @@ -134,7 +128,6 @@ InverseDateScaling::~InverseDateScaling() } double SAL_CALL InverseDateScaling::doScaling( double value ) - throw (uno::RuntimeException, std::exception) { double fResult(value); if( ::rtl::math::isNan( value ) || ::rtl::math::isInf( value ) ) @@ -182,31 +175,26 @@ double SAL_CALL InverseDateScaling::doScaling( double value ) } uno::Reference< XScaling > SAL_CALL InverseDateScaling::getInverseScaling() - throw (uno::RuntimeException, std::exception) { return new DateScaling( m_aNullDate, m_nTimeUnit, m_bShifted ); } OUString SAL_CALL InverseDateScaling::getServiceName() - throw (uno::RuntimeException, std::exception) { return OUString(lcl_aServiceName_InverseDateScaling); } OUString SAL_CALL InverseDateScaling::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString(lcl_aServiceName_InverseDateScaling); } sal_Bool SAL_CALL InverseDateScaling::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL InverseDateScaling::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { lcl_aServiceName_InverseDateScaling }; } diff --git a/chart2/source/view/axes/DateScaling.hxx b/chart2/source/view/axes/DateScaling.hxx index 3ee7f22a8568..acbb5409e9ef 100644 --- a/chart2/source/view/axes/DateScaling.hxx +++ b/chart2/source/view/axes/DateScaling.hxx @@ -41,24 +41,19 @@ public: virtual ~DateScaling() override; /// declare XServiceInfo methods - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // ____ XScaling ____ - virtual double SAL_CALL doScaling( double value ) - throw (css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL doScaling( double value ) override; virtual css::uno::Reference< css::chart2::XScaling > SAL_CALL - getInverseScaling() throw (css::uno::RuntimeException, std::exception) override; + getInverseScaling() override; // ____ XServiceName ____ - virtual OUString SAL_CALL getServiceName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; private: const Date m_aNullDate; @@ -78,23 +73,18 @@ public: virtual ~InverseDateScaling() override; /// declare XServiceInfo methods - virtual OUString SAL_CALL getImplementationName() - throw( css::uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) - throw( css::uno::RuntimeException, std::exception ) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // ____ XScaling ____ - virtual double SAL_CALL doScaling( double value ) - throw (css::uno::RuntimeException, std::exception) override; + virtual double SAL_CALL doScaling( double value ) override; virtual css::uno::Reference< css::chart2::XScaling > SAL_CALL - getInverseScaling() throw (css::uno::RuntimeException, std::exception) override; + getInverseScaling() override; // ____ XServiceName ____ - virtual OUString SAL_CALL getServiceName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getServiceName() override; private: const Date m_aNullDate; diff --git a/chart2/source/view/axes/VAxisBase.cxx b/chart2/source/view/axes/VAxisBase.cxx index e88785840de4..886b67e9edc2 100644 --- a/chart2/source/view/axes/VAxisBase.cxx +++ b/chart2/source/view/axes/VAxisBase.cxx @@ -144,7 +144,6 @@ bool VAxisBase::isAnythingToDraw() void VAxisBase::setExplicitScaleAndIncrement( const ExplicitScaleData& rScale , const ExplicitIncrementData& rIncrement ) - throw (uno::RuntimeException) { m_bReCreateAllTickInfos = true; m_aScale = rScale; diff --git a/chart2/source/view/axes/VAxisBase.hxx b/chart2/source/view/axes/VAxisBase.hxx index 3599972e12b1..3f8f71cd8995 100644 --- a/chart2/source/view/axes/VAxisBase.hxx +++ b/chart2/source/view/axes/VAxisBase.hxx @@ -55,8 +55,7 @@ public: virtual void setExplicitScaleAndIncrement( const ExplicitScaleData& rScale - , const ExplicitIncrementData& rIncrement ) - throw (css::uno::RuntimeException) override; + , const ExplicitIncrementData& rIncrement ) override; virtual sal_Int32 estimateMaximumAutoMainIncrementCount(); virtual void createAllTickInfos( TickInfoArraysType& rAllTickInfos ); diff --git a/chart2/source/view/axes/VAxisOrGridBase.cxx b/chart2/source/view/axes/VAxisOrGridBase.cxx index be5eec08d880..52ddc16fdbcf 100644 --- a/chart2/source/view/axes/VAxisOrGridBase.cxx +++ b/chart2/source/view/axes/VAxisOrGridBase.cxx @@ -43,7 +43,6 @@ VAxisOrGridBase::~VAxisOrGridBase() void VAxisOrGridBase::setExplicitScaleAndIncrement( const ExplicitScaleData& rScale , const ExplicitIncrementData& rIncrement ) - throw (uno::RuntimeException) { m_aScale = rScale; m_aIncrement = rIncrement; diff --git a/chart2/source/view/axes/VAxisOrGridBase.hxx b/chart2/source/view/axes/VAxisOrGridBase.hxx index be81876a06de..44cd5e772a4f 100644 --- a/chart2/source/view/axes/VAxisOrGridBase.hxx +++ b/chart2/source/view/axes/VAxisOrGridBase.hxx @@ -43,8 +43,7 @@ public: /// @throws css::uno::RuntimeException virtual void setExplicitScaleAndIncrement( const ExplicitScaleData& rScale - , const ExplicitIncrementData& rIncrement ) - throw (css::uno::RuntimeException); + , const ExplicitIncrementData& rIncrement ); void set3DWallPositions( CuboidPlanePosition eLeftWallPos, CuboidPlanePosition eBackWallPos, CuboidPlanePosition eBottomPos ); virtual TickFactory* createTickFactory(); diff --git a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx index 5aceed61248b..934d17046ea3 100644 --- a/chart2/source/view/axes/VCartesianCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCartesianCoordinateSystem.cxx @@ -43,8 +43,7 @@ public: } //XTextualDataSequence - virtual uno::Sequence< OUString > SAL_CALL getTextualData() - throw ( uno::RuntimeException, std::exception) override + virtual uno::Sequence< OUString > SAL_CALL getTextualData() override { return m_aTextSequence; } diff --git a/chart2/source/view/axes/VCoordinateSystem.cxx b/chart2/source/view/axes/VCoordinateSystem.cxx index 7cff69374e75..d9440207c956 100644 --- a/chart2/source/view/axes/VCoordinateSystem.cxx +++ b/chart2/source/view/axes/VCoordinateSystem.cxx @@ -99,7 +99,6 @@ void VCoordinateSystem::initPlottingTargets( const Reference< drawing::XShapes , const Reference< drawing::XShapes >& xFinalTarget , const Reference< lang::XMultiServiceFactory >& xShapeFactory , Reference< drawing::XShapes >& xLogicTargetForSeriesBehindAxis ) - throw (uno::RuntimeException, std::exception) { OSL_PRECOND(xLogicTarget.is()&&xFinalTarget.is()&&xShapeFactory.is(),"no proper initialization parameters"); //is only allowed to be called once diff --git a/chart2/source/view/axes/VPolarRadiusAxis.cxx b/chart2/source/view/axes/VPolarRadiusAxis.cxx index a3b1b50c4123..5ebb65809dab 100644 --- a/chart2/source/view/axes/VPolarRadiusAxis.cxx +++ b/chart2/source/view/axes/VPolarRadiusAxis.cxx @@ -61,7 +61,6 @@ void VPolarRadiusAxis::setTransformationSceneToScreen( const drawing::HomogenMat void VPolarRadiusAxis::setExplicitScaleAndIncrement( const ExplicitScaleData& rScale , const ExplicitIncrementData& rIncrement ) - throw (uno::RuntimeException) { VPolarAxis::setExplicitScaleAndIncrement( rScale, rIncrement ); m_apAxisWithLabels->setExplicitScaleAndIncrement( rScale, rIncrement ); @@ -71,7 +70,6 @@ void VPolarRadiusAxis::initPlotter( const uno::Reference< drawing::XShapes >& x , const uno::Reference< drawing::XShapes >& xFinalTarget , const uno::Reference< lang::XMultiServiceFactory >& xShapeFactory , const OUString& rCID ) - throw (uno::RuntimeException) { VPolarAxis::initPlotter( xLogicTarget, xFinalTarget, xShapeFactory, rCID ); m_apAxisWithLabels->initPlotter( xLogicTarget, xFinalTarget, xShapeFactory, rCID ); diff --git a/chart2/source/view/axes/VPolarRadiusAxis.hxx b/chart2/source/view/axes/VPolarRadiusAxis.hxx index b43c2b256cc3..e4f2d85da738 100644 --- a/chart2/source/view/axes/VPolarRadiusAxis.hxx +++ b/chart2/source/view/axes/VPolarRadiusAxis.hxx @@ -43,7 +43,7 @@ public: , const css::uno::Reference< css::drawing::XShapes >& xFinalTarget , const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory , const OUString& rCID - ) throw (css::uno::RuntimeException ) override; + ) override; virtual void setTransformationSceneToScreen( const css::drawing::HomogenMatrix& rMatrix ) override; @@ -51,8 +51,7 @@ public: virtual void setExplicitScaleAndIncrement( const ExplicitScaleData& rScale - , const ExplicitIncrementData& rIncrement ) - throw (css::uno::RuntimeException) override; + , const ExplicitIncrementData& rIncrement ) override; virtual void initAxisLabelProperties( const css::awt::Size& rFontReferenceSize diff --git a/chart2/source/view/charttypes/VSeriesPlotter.cxx b/chart2/source/view/charttypes/VSeriesPlotter.cxx index 9336ea3a9732..fdfc059c11d9 100644 --- a/chart2/source/view/charttypes/VSeriesPlotter.cxx +++ b/chart2/source/view/charttypes/VSeriesPlotter.cxx @@ -2023,7 +2023,6 @@ double VSeriesPlotter::getTransformedDepth() const } void VSeriesPlotter::addSecondaryValueScale( const ExplicitScaleData& rScale, sal_Int32 nAxisIndex ) - throw (uno::RuntimeException) { if( nAxisIndex<1 ) return; diff --git a/chart2/source/view/inc/Linear3DTransformation.hxx b/chart2/source/view/inc/Linear3DTransformation.hxx index 396d1e57379f..3572caab7a7c 100644 --- a/chart2/source/view/inc/Linear3DTransformation.hxx +++ b/chart2/source/view/inc/Linear3DTransformation.hxx @@ -37,15 +37,11 @@ public: // ____ XTransformation ____ /// @see css::chart2::XTransformation virtual css::uno::Sequence< double > SAL_CALL transform( - const css::uno::Sequence< double >& rSourceValues ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< double >& rSourceValues ) override; /// @see css::chart2::XTransformation - virtual sal_Int32 SAL_CALL getSourceDimension() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getSourceDimension() override; /// @see css::chart2::XTransformation - virtual sal_Int32 SAL_CALL getTargetDimension() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getTargetDimension() override; private: css::drawing::HomogenMatrix m_Matrix; diff --git a/chart2/source/view/inc/PlotterBase.hxx b/chart2/source/view/inc/PlotterBase.hxx index 1d12d8633e56..8c408328f419 100644 --- a/chart2/source/view/inc/PlotterBase.hxx +++ b/chart2/source/view/inc/PlotterBase.hxx @@ -54,7 +54,7 @@ public: , const css::uno::Reference< css::drawing::XShapes >& xFinalTarget , const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory , const OUString& rCID - ) throw (css::uno::RuntimeException, std::exception); + ); virtual void setScales( const ::std::vector< ExplicitScaleData >& rScales, bool bSwapXAndYAxis ); diff --git a/chart2/source/view/inc/VCoordinateSystem.hxx b/chart2/source/view/inc/VCoordinateSystem.hxx index aac86229d1b9..97ceebd16050 100644 --- a/chart2/source/view/inc/VCoordinateSystem.hxx +++ b/chart2/source/view/inc/VCoordinateSystem.hxx @@ -55,8 +55,7 @@ public: const css::uno::Reference< css::drawing::XShapes >& xLogicTarget , const css::uno::Reference< css::drawing::XShapes >& xFinalTarget , const css::uno::Reference< css::lang::XMultiServiceFactory >& xFactory - , css::uno::Reference< css::drawing::XShapes >& xLogicTargetForSeriesBehindAxis ) - throw (css::uno::RuntimeException, std::exception); + , css::uno::Reference< css::drawing::XShapes >& xLogicTargetForSeriesBehindAxis ); void setParticle( const OUString& rCooSysParticle ); diff --git a/chart2/source/view/inc/VPolarTransformation.hxx b/chart2/source/view/inc/VPolarTransformation.hxx index a9b548e70d1e..af9404ffc1d5 100644 --- a/chart2/source/view/inc/VPolarTransformation.hxx +++ b/chart2/source/view/inc/VPolarTransformation.hxx @@ -37,15 +37,11 @@ public: // ____ XTransformation ____ /// @see css::chart2::XTransformation virtual css::uno::Sequence< double > SAL_CALL transform( - const css::uno::Sequence< double >& rSourceValues ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< double >& rSourceValues ) override; /// @see css::chart2::XTransformation - virtual sal_Int32 SAL_CALL getSourceDimension() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getSourceDimension() override; /// @see css::chart2::XTransformation - virtual sal_Int32 SAL_CALL getTargetDimension() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getTargetDimension() override; private: PolarPlottingPositionHelper m_aPositionHelper; diff --git a/chart2/source/view/inc/VSeriesPlotter.hxx b/chart2/source/view/inc/VSeriesPlotter.hxx index 470de99d98cb..571d903843dd 100644 --- a/chart2/source/view/inc/VSeriesPlotter.hxx +++ b/chart2/source/view/inc/VSeriesPlotter.hxx @@ -156,8 +156,7 @@ public: @throws css::uno::RuntimeException */ - void addSecondaryValueScale( const ExplicitScaleData& rScale, sal_Int32 nAxisIndex ) - throw (css::uno::RuntimeException); + void addSecondaryValueScale( const ExplicitScaleData& rScale, sal_Int32 nAxisIndex ); // MinimumAndMaximumSupplier diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx index 23023bdf26c4..c3ea04246c93 100644 --- a/chart2/source/view/main/ChartView.cxx +++ b/chart2/source/view/main/ChartView.cxx @@ -1213,7 +1213,6 @@ void ChartView::init() } void SAL_CALL ChartView::initialize( const uno::Sequence< uno::Any >& ) - throw ( uno::Exception, uno::RuntimeException, std::exception) { init(); } @@ -1315,7 +1314,6 @@ void ChartView::getMetaFile( const uno::Reference< io::XOutputStream >& xOutStre } uno::Any SAL_CALL ChartView::getTransferData( const datatransfer::DataFlavor& aFlavor ) - throw (datatransfer::UnsupportedFlavorException, io::IOException, uno::RuntimeException, std::exception) { bool bHighContrastMetaFile( aFlavor.MimeType.equals(lcl_aGDIMetaFileMIMETypeHighContrast)); uno::Any aRet; @@ -1349,7 +1347,6 @@ uno::Any SAL_CALL ChartView::getTransferData( const datatransfer::DataFlavor& aF return aRet; } uno::Sequence< datatransfer::DataFlavor > SAL_CALL ChartView::getTransferDataFlavors() - throw (uno::RuntimeException, std::exception) { uno::Sequence< datatransfer::DataFlavor > aRet(2); @@ -1363,7 +1360,6 @@ uno::Sequence< datatransfer::DataFlavor > SAL_CALL ChartView::getTransferDataFla return aRet; } sal_Bool SAL_CALL ChartView::isDataFlavorSupported( const datatransfer::DataFlavor& aFlavor ) - throw (uno::RuntimeException, std::exception) { return ( aFlavor.MimeType.equals(lcl_aGDIMetaFileMIMEType) || aFlavor.MimeType.equals(lcl_aGDIMetaFileMIMETypeHighContrast) ); @@ -1371,7 +1367,6 @@ sal_Bool SAL_CALL ChartView::isDataFlavorSupported( const datatransfer::DataFlav // ____ XUnoTunnel ___ ::sal_Int64 SAL_CALL ChartView::getSomething( const uno::Sequence< ::sal_Int8 >& aIdentifier ) - throw( uno::RuntimeException, std::exception) { if( aIdentifier.getLength() == 16 && 0 == memcmp( ExplicitValueProvider::getUnoTunnelId().getConstArray(), aIdentifier.getConstArray(), 16 ) ) @@ -1385,19 +1380,16 @@ sal_Bool SAL_CALL ChartView::isDataFlavorSupported( const datatransfer::DataFlav // lang::XServiceInfo OUString SAL_CALL ChartView::getImplementationName() - throw( css::uno::RuntimeException, std::exception ) { return OUString(CHART_VIEW_SERVICE_IMPLEMENTATION_NAME); } sal_Bool SAL_CALL ChartView::supportsService( const OUString& rServiceName ) - throw( css::uno::RuntimeException, std::exception ) { return cppu::supportsService(this, rServiceName); } css::uno::Sequence< OUString > SAL_CALL ChartView::getSupportedServiceNames() - throw( css::uno::RuntimeException, std::exception ) { return { CHART_VIEW_SERVICE_NAME }; } @@ -2691,7 +2683,6 @@ void ChartView::render() // util::XEventListener (base of XCloseListener) void SAL_CALL ChartView::disposing( const lang::EventObject& /* rSource */ ) - throw(uno::RuntimeException, std::exception) { } @@ -2772,7 +2763,6 @@ void ChartView::impl_updateView( bool bCheckLockedCtrler ) // ____ XModifyListener ____ void SAL_CALL ChartView::modified( const lang::EventObject& /* aEvent */ ) - throw (uno::RuntimeException, std::exception) { m_bViewDirty = true; if( m_bInViewUpdate ) @@ -2870,30 +2860,26 @@ void ChartView::impl_notifyModeChangeListener( const OUString& rNewMode ) // ____ XModeChangeBroadcaster ____ void SAL_CALL ChartView::addModeChangeListener( const uno::Reference< util::XModeChangeListener >& xListener ) - throw (uno::RuntimeException, std::exception) { m_aListenerContainer.addInterface( cppu::UnoType::get(), xListener ); } void SAL_CALL ChartView::removeModeChangeListener( const uno::Reference< util::XModeChangeListener >& xListener ) - throw (uno::RuntimeException, std::exception) { m_aListenerContainer.removeInterface( cppu::UnoType::get(), xListener ); } void SAL_CALL ChartView::addModeChangeApproveListener( const uno::Reference< util::XModeChangeApproveListener >& /* _rxListener */ ) - throw (lang::NoSupportException, uno::RuntimeException, std::exception) { } void SAL_CALL ChartView::removeModeChangeApproveListener( const uno::Reference< util::XModeChangeApproveListener >& /* _rxListener */ ) - throw (lang::NoSupportException, uno::RuntimeException, std::exception) { } // ____ XUpdatable ____ -void SAL_CALL ChartView::update() throw (uno::RuntimeException, std::exception) +void SAL_CALL ChartView::update() { impl_updateView(); @@ -2906,19 +2892,18 @@ void SAL_CALL ChartView::update() throw (uno::RuntimeException, std::exception) impl_updateView(); } -void SAL_CALL ChartView::updateSoft() throw (uno::RuntimeException, std::exception) +void SAL_CALL ChartView::updateSoft() { update(); } -void SAL_CALL ChartView::updateHard() throw (uno::RuntimeException, std::exception) +void SAL_CALL ChartView::updateHard() { impl_updateView(false); } // ____ XPropertySet ____ Reference< beans::XPropertySetInfo > SAL_CALL ChartView::getPropertySetInfo() - throw (uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); return nullptr; @@ -2926,8 +2911,6 @@ Reference< beans::XPropertySetInfo > SAL_CALL ChartView::getPropertySetInfo() void SAL_CALL ChartView::setPropertyValue( const OUString& rPropertyName , const Any& rValue ) - throw (beans::UnknownPropertyException, beans::PropertyVetoException, lang::IllegalArgumentException - , lang::WrappedTargetException, uno::RuntimeException, std::exception) { if( rPropertyName == "Resolution" ) { @@ -2980,7 +2963,6 @@ void SAL_CALL ChartView::setPropertyValue( const OUString& rPropertyName } Any SAL_CALL ChartView::getPropertyValue( const OUString& rPropertyName ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { Any aRet; if( rPropertyName == "Resolution" ) @@ -2994,25 +2976,21 @@ Any SAL_CALL ChartView::getPropertyValue( const OUString& rPropertyName ) void SAL_CALL ChartView::addPropertyChangeListener( const OUString& /* aPropertyName */, const Reference< beans::XPropertyChangeListener >& /* xListener */ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL ChartView::removePropertyChangeListener( const OUString& /* aPropertyName */, const Reference< beans::XPropertyChangeListener >& /* aListener */ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL ChartView::addVetoableChangeListener( const OUString& /* PropertyName */, const Reference< beans::XVetoableChangeListener >& /* aListener */ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } void SAL_CALL ChartView::removeVetoableChangeListener( const OUString& /* PropertyName */, const Reference< beans::XVetoableChangeListener >& /* aListener */ ) - throw (beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { OSL_FAIL("not implemented"); } @@ -3020,7 +2998,6 @@ void SAL_CALL ChartView::removeVetoableChangeListener( const OUString& /* Proper // ____ XMultiServiceFactory ____ Reference< uno::XInterface > ChartView::createInstance( const OUString& aServiceSpecifier ) - throw (uno::Exception, uno::RuntimeException, std::exception) { SolarMutexGuard aSolarGuard; @@ -3081,14 +3058,13 @@ Reference< uno::XInterface > ChartView::createInstance( const OUString& aService } Reference< uno::XInterface > ChartView::createInstanceWithArguments( const OUString& ServiceSpecifier, const uno::Sequence< uno::Any >& Arguments ) - throw (uno::Exception, uno::RuntimeException, std::exception) { OSL_ENSURE( Arguments.getLength(), "ChartView::createInstanceWithArguments: arguments are ignored" ); (void) Arguments; // avoid warning return createInstance( ServiceSpecifier ); } -uno::Sequence< OUString > ChartView::getAvailableServiceNames() throw (uno::RuntimeException, std::exception) +uno::Sequence< OUString > ChartView::getAvailableServiceNames() { uno::Sequence< OUString > aServiceNames( 6 ); @@ -3102,7 +3078,7 @@ uno::Sequence< OUString > ChartView::getAvailableServiceNames() throw (uno::Runt return aServiceNames; } -OUString ChartView::dump() throw (uno::RuntimeException, std::exception) +OUString ChartView::dump() { #if HAVE_FEATURE_DESKTOP // Used for unit tests and in chartcontroller only, no need to drag in this when cross-compiling diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx index 579765ab18da..115654d66bd7 100644 --- a/chart2/source/view/main/DummyXShape.cxx +++ b/chart2/source/view/main/DummyXShape.cxx @@ -84,27 +84,22 @@ public: explicit DummyPropertySetInfo(const std::map& rProps ): mrProperties(rProps) {} - virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& rName ) - throw(uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasPropertyByName( const OUString& rName ) override; - virtual beans::Property SAL_CALL getPropertyByName( const OUString& rName ) - throw(uno::RuntimeException, beans::UnknownPropertyException, std::exception) override; + virtual beans::Property SAL_CALL getPropertyByName( const OUString& rName ) override; - virtual uno::Sequence< beans::Property > SAL_CALL getProperties() - throw(uno::RuntimeException, std::exception) override; + virtual uno::Sequence< beans::Property > SAL_CALL getProperties() override; private: const std::map& mrProperties; }; sal_Bool SAL_CALL DummyPropertySetInfo::hasPropertyByName( const OUString& rName ) - throw(uno::RuntimeException, std::exception) { return mrProperties.find(rName) != mrProperties.end(); } beans::Property SAL_CALL DummyPropertySetInfo::getPropertyByName( const OUString& rName ) - throw(uno::RuntimeException, beans::UnknownPropertyException, std::exception) { beans::Property aRet; if(mrProperties.find(rName) == mrProperties.end()) @@ -118,7 +113,6 @@ beans::Property SAL_CALL DummyPropertySetInfo::getPropertyByName( const OUString } uno::Sequence< beans::Property > SAL_CALL DummyPropertySetInfo::getProperties() - throw(uno::RuntimeException, std::exception) { uno::Sequence< beans::Property > aRet(mrProperties.size()); @@ -163,57 +157,46 @@ DummyXShape::DummyXShape() } OUString SAL_CALL DummyXShape::getName() - throw(uno::RuntimeException, std::exception) { return maName; } void SAL_CALL DummyXShape::setName( const OUString& rName ) - throw(uno::RuntimeException, std::exception) { maName = rName; } awt::Point SAL_CALL DummyXShape::getPosition() - throw(uno::RuntimeException, std::exception) { return maPosition; } void SAL_CALL DummyXShape::setPosition( const awt::Point& rPoint ) - throw(uno::RuntimeException, std::exception) { maPosition = rPoint; } awt::Size SAL_CALL DummyXShape::getSize() - throw(uno::RuntimeException, std::exception) { return maSize; } void SAL_CALL DummyXShape::setSize( const awt::Size& rSize ) - throw(beans::PropertyVetoException, uno::RuntimeException, std::exception) { maSize = rSize; } OUString SAL_CALL DummyXShape::getShapeType() - throw(uno::RuntimeException, std::exception) { return OUString("dummy shape"); } uno::Reference< beans::XPropertySetInfo > SAL_CALL DummyXShape::getPropertySetInfo() - throw(uno::RuntimeException, std::exception) { return new DummyPropertySetInfo(maProperties); } void SAL_CALL DummyXShape::setPropertyValue( const OUString& rName, const uno::Any& rValue) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SAL_INFO("chart2", "DummyXShape::setProperty: " << rName << " Any"); maProperties[rName] = rValue; @@ -224,7 +207,6 @@ void SAL_CALL DummyXShape::setPropertyValue( const OUString& rName, const uno::A } uno::Any SAL_CALL DummyXShape::getPropertyValue( const OUString& rName ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { SAL_INFO("chart2.opengl", "DummyXShape::getPropertyValue: " << rName); std::map::iterator itr = maProperties.find(rName); @@ -235,29 +217,23 @@ uno::Any SAL_CALL DummyXShape::getPropertyValue( const OUString& rName ) } void SAL_CALL DummyXShape::addPropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { } void SAL_CALL DummyXShape::removePropertyChangeListener( const OUString&, const uno::Reference< beans::XPropertyChangeListener >& ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { } void SAL_CALL DummyXShape::addVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { } void SAL_CALL DummyXShape::removeVetoableChangeListener( const OUString&, const uno::Reference< beans::XVetoableChangeListener >& ) - throw(beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException, std::exception) { } void SAL_CALL DummyXShape::setPropertyValues( const uno::Sequence< OUString >& rNames, const uno::Sequence< uno::Any >& rValues) -throw (beans::PropertyVetoException, lang::IllegalArgumentException, - lang::WrappedTargetException, uno::RuntimeException, std::exception) { size_t n = std::min(rNames.getLength(), rValues.getLength()); for(size_t i = 0; i < n; ++i) @@ -268,7 +244,6 @@ throw (beans::PropertyVetoException, lang::IllegalArgumentException, uno::Sequence< uno::Any > SAL_CALL DummyXShape::getPropertyValues( const uno::Sequence< OUString >& rNames) - throw (uno::RuntimeException, std::exception) { uno::Sequence< uno::Any > aValues(rNames.getLength()); for(sal_Int32 i = 0; i < rNames.getLength(); ++i) @@ -282,22 +257,20 @@ uno::Sequence< uno::Any > SAL_CALL DummyXShape::getPropertyValues( return aValues; } -void SAL_CALL DummyXShape::addPropertiesChangeListener( const uno::Sequence< OUString >& , const uno::Reference< beans::XPropertiesChangeListener >& ) throw (uno::RuntimeException, std::exception) +void SAL_CALL DummyXShape::addPropertiesChangeListener( const uno::Sequence< OUString >& , const uno::Reference< beans::XPropertiesChangeListener >& ) { } -void SAL_CALL DummyXShape::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& ) throw (uno::RuntimeException, std::exception) +void SAL_CALL DummyXShape::removePropertiesChangeListener( const uno::Reference< beans::XPropertiesChangeListener >& ) { } void SAL_CALL DummyXShape::firePropertiesChangeEvent( const uno::Sequence< OUString >& , const uno::Reference< beans::XPropertiesChangeListener >& ) - throw (uno::RuntimeException, std::exception) { } OUString SAL_CALL DummyXShape::getImplementationName() - throw(uno::RuntimeException, std::exception) { return OUString("DummyXShape"); } @@ -316,25 +289,21 @@ uno::Sequence< OUString > const & listSupportedServices() } uno::Sequence< OUString > SAL_CALL DummyXShape::getSupportedServiceNames() - throw(uno::RuntimeException, std::exception) { return listSupportedServices(); } sal_Bool SAL_CALL DummyXShape::supportsService( const OUString& rServiceName ) - throw(uno::RuntimeException, std::exception) { return cppu::supportsService(this, rServiceName); } uno::Reference< uno::XInterface > SAL_CALL DummyXShape::getParent() - throw(uno::RuntimeException, std::exception) { return mxParent; } void SAL_CALL DummyXShape::setParent( const uno::Reference< uno::XInterface >& xParent ) - throw(lang::NoSupportException, uno::RuntimeException, std::exception) { mxParent = xParent; } @@ -887,16 +856,12 @@ void DummyText::render() } void SAL_CALL DummyText::setPropertyValue( const OUString& rName, const uno::Any& rValue) - throw(beans::UnknownPropertyException, beans::PropertyVetoException, - lang::IllegalArgumentException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { SAL_INFO("chart2.opengl", "property value set after image has been created"); DummyXShape::setPropertyValue(rName, rValue); } void SAL_CALL DummyText::setPosition(const awt::Point& rPosition ) - throw(uno::RuntimeException, std::exception) { DummyXShape::setPosition(rPosition); if(maTrans.hasValue()) @@ -932,7 +897,6 @@ DummyGroup2D::DummyGroup2D(const OUString& rName) } awt::Point SAL_CALL DummyGroup2D::getPosition() - throw(uno::RuntimeException, std::exception) { long nTop = std::numeric_limits::max(); long nLeft = std::numeric_limits::max(); @@ -951,7 +915,6 @@ awt::Point SAL_CALL DummyGroup2D::getPosition() } awt::Size SAL_CALL DummyGroup2D::getSize() - throw(uno::RuntimeException, std::exception) { long nTop = std::numeric_limits::max(); long nLeft = std::numeric_limits::max(); @@ -972,7 +935,6 @@ awt::Size SAL_CALL DummyGroup2D::getSize() } void SAL_CALL DummyGroup2D::setPosition( const awt::Point& rPos ) - throw(uno::RuntimeException, std::exception) { for(std::vector::const_iterator itr = maShapes.begin(), itrEnd = maShapes.end(); itr != itrEnd; ++itr) @@ -984,7 +946,6 @@ void SAL_CALL DummyGroup2D::setPosition( const awt::Point& rPos ) } void SAL_CALL DummyGroup2D::setSize( const awt::Size& ) - throw( beans::PropertyVetoException, uno::RuntimeException, std::exception ) { SAL_WARN("chart2.opengl", "set size on group shape"); } @@ -1008,7 +969,6 @@ DummyChart* DummyChart::getRootShape() } uno::Any SAL_CALL DummyXShapes::queryInterface( const uno::Type& rType ) - throw(uno::RuntimeException, std::exception) { if( rType == cppu::UnoType::get() ) return uno::makeAny(uno::Reference(this)); @@ -1018,7 +978,6 @@ uno::Any SAL_CALL DummyXShapes::queryInterface( const uno::Type& rType ) } uno::Any SAL_CALL DummyXShapes::queryAggregation( const uno::Type & rType ) - throw(uno::RuntimeException, std::exception) { if( rType == cppu::UnoType::get() ) return uno::makeAny(uno::Reference< drawing::XShapes >(this)); @@ -1039,7 +998,6 @@ void DummyXShapes::release() } void SAL_CALL DummyXShapes::add( const uno::Reference< drawing::XShape>& xShape ) - throw(uno::RuntimeException, std::exception) { DummyXShape& rChild = dynamic_cast(*xShape.get()); maUNOShapes.push_back(xShape); @@ -1048,7 +1006,6 @@ void SAL_CALL DummyXShapes::add( const uno::Reference< drawing::XShape>& xShape } void SAL_CALL DummyXShapes::remove( const uno::Reference< drawing::XShape>& xShape ) - throw(uno::RuntimeException, std::exception) { std::vector< uno::Reference >::iterator itr = std::find(maUNOShapes.begin(), maUNOShapes.end(), xShape); if(itr != maUNOShapes.end()) @@ -1063,26 +1020,21 @@ void SAL_CALL DummyXShapes::remove( const uno::Reference< drawing::XShape>& xSha } uno::Type SAL_CALL DummyXShapes::getElementType() - throw(uno::RuntimeException, std::exception) { return cppu::UnoType::get(); } sal_Bool SAL_CALL DummyXShapes::hasElements() - throw(uno::RuntimeException, std::exception) { return !maUNOShapes.empty(); } sal_Int32 SAL_CALL DummyXShapes::getCount() - throw(uno::RuntimeException, std::exception) { return maUNOShapes.size(); } uno::Any SAL_CALL DummyXShapes::getByIndex(sal_Int32 nIndex) - throw(lang::IndexOutOfBoundsException, lang::WrappedTargetException, - uno::RuntimeException, std::exception) { uno::Any aShape; aShape <<= maUNOShapes[nIndex]; @@ -1108,7 +1060,6 @@ DummyChart::DummyChart(): } void SAL_CALL DummyChart::setPosition( const awt::Point& aPosition ) - throw( uno::RuntimeException, std::exception ) { DummyXShape::setPosition(aPosition); } @@ -1118,7 +1069,6 @@ DummyChart::~DummyChart() } void SAL_CALL DummyChart::setSize( const awt::Size& aSize ) - throw( beans::PropertyVetoException, uno::RuntimeException, std::exception ) { SAL_INFO("chart2.opengl", "DummyChart::setSize()---aSize.Width = " << aSize.Width << ", aSize.Height = " << aSize.Height); int width = aSize.Width; diff --git a/chart2/source/view/main/DummyXShape.hxx b/chart2/source/view/main/DummyXShape.hxx index 1b3c634e52c8..fddf6a117f62 100644 --- a/chart2/source/view/main/DummyXShape.hxx +++ b/chart2/source/view/main/DummyXShape.hxx @@ -110,53 +110,49 @@ public: DummyXShape(); // XNamed - virtual OUString SAL_CALL getName() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setName( const OUString& aName ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; + virtual void SAL_CALL setName( const OUString& aName ) override; // XShape - virtual css::awt::Point SAL_CALL getPosition() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::awt::Size SAL_CALL getSize() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSize( const css::awt::Size& aSize ) throw(css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getPosition() override; + virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override; + virtual css::awt::Size SAL_CALL getSize() override; + virtual void SAL_CALL setSize( const css::awt::Size& aSize ) override; // XShapeDescriptor - virtual OUString SAL_CALL getShapeType() throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getShapeType() override; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; + virtual css::uno::Any SAL_CALL getPropertyValue( const OUString& PropertyName ) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; + virtual void SAL_CALL addVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; + virtual void SAL_CALL removeVetoableChangeListener( const OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) override; // XMultiPropertySet virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< OUString >& aPropertyNames, - const css::uno::Sequence< css::uno::Any >& aValues ) - throw (css::beans::PropertyVetoException, css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::uno::Any >& aValues ) override; virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( - const css::uno::Sequence< OUString >& aPropertyNames ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< OUString >& aPropertyNames ) override; - virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertiesChangeListener( const css::uno::Sequence< OUString >& aPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; - virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL removePropertiesChangeListener( const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; virtual void SAL_CALL firePropertiesChangeEvent( const css::uno::Sequence< OUString >& aPropertyNames, - const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertiesChangeListener >& xListener ) override; // XChild - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) throw(css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getParent( ) override; + virtual void SAL_CALL setParent( const css::uno::Reference< css::uno::XInterface >& Parent ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; // normal non UNO methods @@ -311,9 +307,9 @@ public: virtual void render() override; - virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPropertyValue( const OUString& aPropertyName, const css::uno::Any& aValue ) override; - virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override; private: void setTransformatAsProperty(const css::drawing::HomogenMatrix3& rMatrix); @@ -328,22 +324,22 @@ class DummyXShapes : public DummyXShape, public css::drawing::XShapes { public: - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; + virtual css::uno::Any SAL_CALL queryAggregation( const css::uno::Type& rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XShapes - virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XShape >& xShape ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL add( const css::uno::Reference< css::drawing::XShape >& xShape ) override; + virtual void SAL_CALL remove( const css::uno::Reference< css::drawing::XShape >& xShape ) override; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType() throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount() throw(css::uno::RuntimeException, std::exception) override ; - virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount() override ; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 Index ) override; // normal methods virtual void render() override; @@ -360,8 +356,8 @@ public: virtual ~DummyChart() override; virtual DummyChart* getRootShape() override; - virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSize( const css::awt::Size& aSize ) throw(css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override; + virtual void SAL_CALL setSize( const css::awt::Size& aSize ) override; virtual void render() override; @@ -386,10 +382,10 @@ class DummyGroup2D : public DummyXShapes public: explicit DummyGroup2D(const OUString& rName); - virtual css::awt::Point SAL_CALL getPosition() throw(css::uno::RuntimeException, std::exception) override; - virtual css::awt::Size SAL_CALL getSize() throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setSize( const css::awt::Size& aSize ) throw(css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) override; + virtual css::awt::Point SAL_CALL getPosition() override; + virtual css::awt::Size SAL_CALL getSize() override; + virtual void SAL_CALL setPosition( const css::awt::Point& aPosition ) override; + virtual void SAL_CALL setSize( const css::awt::Size& aSize ) override; }; class DummyGroup3D : public DummyXShapes diff --git a/chart2/source/view/main/Linear3DTransformation.cxx b/chart2/source/view/main/Linear3DTransformation.cxx index 30597f83f578..302ce68f2a2f 100644 --- a/chart2/source/view/main/Linear3DTransformation.cxx +++ b/chart2/source/view/main/Linear3DTransformation.cxx @@ -39,8 +39,6 @@ Linear3DTransformation::~Linear3DTransformation() // ____ XTransformation ____ Sequence< double > SAL_CALL Linear3DTransformation::transform( const Sequence< double >& rSourceValues ) - throw (RuntimeException, - lang::IllegalArgumentException, std::exception) { double fX = rSourceValues[0]; double fY = rSourceValues[1]; @@ -82,13 +80,11 @@ Sequence< double > SAL_CALL Linear3DTransformation::transform( } sal_Int32 SAL_CALL Linear3DTransformation::getSourceDimension() - throw (RuntimeException, std::exception) { return 3; } sal_Int32 SAL_CALL Linear3DTransformation::getTargetDimension() - throw (RuntimeException, std::exception) { return 3; } diff --git a/chart2/source/view/main/PlotterBase.cxx b/chart2/source/view/main/PlotterBase.cxx index 326d4086e9ce..65548cc4ace5 100644 --- a/chart2/source/view/main/PlotterBase.cxx +++ b/chart2/source/view/main/PlotterBase.cxx @@ -44,7 +44,6 @@ void PlotterBase::initPlotter( const uno::Reference< drawing::XShapes >& xLogic , const uno::Reference< drawing::XShapes >& xFinalTarget , const uno::Reference< lang::XMultiServiceFactory >& xShapeFactory , const OUString& rCID ) - throw (uno::RuntimeException, std::exception) { OSL_PRECOND(xLogicTarget.is()&&xFinalTarget.is()&&xShapeFactory.is(),"no proper initialization parameters"); //is only allowed to be called once diff --git a/chart2/source/view/main/VPolarTransformation.cxx b/chart2/source/view/main/VPolarTransformation.cxx index e75e2a13b19d..93d6aa26f975 100644 --- a/chart2/source/view/main/VPolarTransformation.cxx +++ b/chart2/source/view/main/VPolarTransformation.cxx @@ -43,8 +43,6 @@ VPolarTransformation::~VPolarTransformation() // ____ XTransformation ____ Sequence< double > SAL_CALL VPolarTransformation::transform( const Sequence< double >& rSourceValues ) - throw (RuntimeException, - lang::IllegalArgumentException, std::exception) { double fScaledLogicAngle = rSourceValues[0]; double fScaledLogicRadius = rSourceValues[1]; @@ -67,13 +65,11 @@ Sequence< double > SAL_CALL VPolarTransformation::transform( } sal_Int32 SAL_CALL VPolarTransformation::getSourceDimension() - throw (RuntimeException, std::exception) { return 3; } sal_Int32 SAL_CALL VPolarTransformation::getTargetDimension() - throw (RuntimeException, std::exception) { return 3; } diff --git a/codemaker/source/codemaker/options.cxx b/codemaker/source/codemaker/options.cxx index 83d0b2fd5633..53560800fc1b 100644 --- a/codemaker/source/codemaker/options.cxx +++ b/codemaker/source/codemaker/options.cxx @@ -38,7 +38,6 @@ bool Options::isValid(const OString& option) const } const OString& Options::getOption(const OString& option) const - throw( IllegalArgument ) { OptionMap::const_iterator i(m_options.find(option)); if (i == m_options.end()) { diff --git a/codemaker/source/cppumaker/cppuoptions.cxx b/codemaker/source/cppumaker/cppuoptions.cxx index 2f7724b6290a..3a0bdb5d0cd4 100644 --- a/codemaker/source/cppumaker/cppuoptions.cxx +++ b/codemaker/source/cppumaker/cppuoptions.cxx @@ -33,7 +33,6 @@ using ::rtl::OString; #endif bool CppuOptions::initOptions(int ac, char* av[], bool bCmdFile) - throw( IllegalArgument ) { bool ret = true; sal_uInt16 i=0; diff --git a/codemaker/source/cppumaker/cppuoptions.hxx b/codemaker/source/cppumaker/cppuoptions.hxx index 9d5addf326e9..497fbd96402b 100644 --- a/codemaker/source/cppumaker/cppuoptions.hxx +++ b/codemaker/source/cppumaker/cppuoptions.hxx @@ -28,8 +28,7 @@ public: CppuOptions() : Options() {} - bool initOptions(int ac, char* av[], bool bCmdFile=false) - throw( IllegalArgument ) override; + bool initOptions(int ac, char* av[], bool bCmdFile=false) override; OString prepareHelp() override; diff --git a/codemaker/source/javamaker/javaoptions.cxx b/codemaker/source/javamaker/javaoptions.cxx index bdfa4ebd78d1..97eef36b0e30 100644 --- a/codemaker/source/javamaker/javaoptions.cxx +++ b/codemaker/source/javamaker/javaoptions.cxx @@ -31,7 +31,6 @@ #endif bool JavaOptions::initOptions(int ac, char* av[], bool bCmdFile) - throw( IllegalArgument ) { bool ret = true; sal_uInt16 i=0; diff --git a/codemaker/source/javamaker/javaoptions.hxx b/codemaker/source/javamaker/javaoptions.hxx index 817d8805e123..e4eed6883849 100644 --- a/codemaker/source/javamaker/javaoptions.hxx +++ b/codemaker/source/javamaker/javaoptions.hxx @@ -28,8 +28,7 @@ public: JavaOptions() : Options() {} - bool initOptions(int ac, char* av[], bool bCmdFile=false) - throw( IllegalArgument ) override; + bool initOptions(int ac, char* av[], bool bCmdFile=false) override; OString prepareHelp() override; diff --git a/comphelper/qa/container/comphelper_ifcontainer.cxx b/comphelper/qa/container/comphelper_ifcontainer.cxx index 135adfdb9304..5a6cff89583d 100644 --- a/comphelper/qa/container/comphelper_ifcontainer.cxx +++ b/comphelper/qa/container/comphelper_ifcontainer.cxx @@ -47,8 +47,7 @@ public: explicit ContainerListener(ContainerStats *pStats) : m_pStats(pStats) { m_pStats->m_nAlive++; } virtual ~ContainerListener() override { m_pStats->m_nAlive--; } - virtual void SAL_CALL disposing( const EventObject& ) - throw (RuntimeException, std::exception) override + virtual void SAL_CALL disposing( const EventObject& ) override { m_pStats->m_nDisposed++; } diff --git a/comphelper/qa/container/testifcontainer.cxx b/comphelper/qa/container/testifcontainer.cxx index e881f6739db6..b39eef1d5bd4 100644 --- a/comphelper/qa/container/testifcontainer.cxx +++ b/comphelper/qa/container/testifcontainer.cxx @@ -48,13 +48,12 @@ class TestListener : public cppu::WeakImplHelper< XVetoableChangeListener > { public: // Methods - virtual void SAL_CALL disposing( const css::lang::EventObject& /*Source*/ ) throw(css::uno::RuntimeException) override + virtual void SAL_CALL disposing( const css::lang::EventObject& /*Source*/ ) override { } - virtual void SAL_CALL vetoableChange( const css::beans::PropertyChangeEvent& /*aEvent*/ ) - throw(css::beans::PropertyVetoException, css::uno::RuntimeException) override + virtual void SAL_CALL vetoableChange( const css::beans::PropertyChangeEvent& /*aEvent*/ ) override { } diff --git a/comphelper/qa/string/test_string.cxx b/comphelper/qa/string/test_string.cxx index 636c30587370..1180805542fa 100644 --- a/comphelper/qa/string/test_string.cxx +++ b/comphelper/qa/string/test_string.cxx @@ -89,29 +89,26 @@ class testCollator : public cppu::WeakImplHelper< i18n::XCollator > public: virtual sal_Int32 SAL_CALL compareSubstring( const OUString& str1, sal_Int32 off1, sal_Int32 len1, - const OUString& str2, sal_Int32 off2, sal_Int32 len2) throw(uno::RuntimeException, std::exception) override + const OUString& str2, sal_Int32 off2, sal_Int32 len2) override { return str1.copy(off1, len1).compareTo(str2.copy(off2, len2)); } virtual sal_Int32 SAL_CALL compareString( const OUString& str1, - const OUString& str2) throw(uno::RuntimeException, std::exception) override + const OUString& str2) override { return str1.compareTo(str2); } - virtual sal_Int32 SAL_CALL loadDefaultCollator(const lang::Locale&, sal_Int32) - throw(uno::RuntimeException, std::exception) override {return 0;} + virtual sal_Int32 SAL_CALL loadDefaultCollator(const lang::Locale&, sal_Int32) override {return 0;} virtual sal_Int32 SAL_CALL loadCollatorAlgorithm(const OUString&, - const lang::Locale&, sal_Int32) throw(uno::RuntimeException, std::exception) override {return 0;} + const lang::Locale&, sal_Int32) override {return 0;} virtual void SAL_CALL loadCollatorAlgorithmWithEndUserOption(const OUString&, - const lang::Locale&, const uno::Sequence< sal_Int32 >&) throw(uno::RuntimeException, std::exception) override {} - virtual uno::Sequence< OUString > SAL_CALL listCollatorAlgorithms(const lang::Locale&) - throw(uno::RuntimeException, std::exception) override + const lang::Locale&, const uno::Sequence< sal_Int32 >&) override {} + virtual uno::Sequence< OUString > SAL_CALL listCollatorAlgorithms(const lang::Locale&) override { return uno::Sequence< OUString >(); } - virtual uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions(const OUString&) - throw(uno::RuntimeException, std::exception) override + virtual uno::Sequence< sal_Int32 > SAL_CALL listCollatorOptions(const OUString&) override { return uno::Sequence< sal_Int32 >(); } @@ -123,64 +120,59 @@ class testBreakIterator : public cppu::WeakImplHelper< i18n::XBreakIterator > { public: virtual sal_Int32 SAL_CALL nextCharacters( const OUString&, sal_Int32, - const lang::Locale&, sal_Int16, sal_Int32, sal_Int32& ) - throw(uno::RuntimeException, std::exception) override {return -1;} + const lang::Locale&, sal_Int16, sal_Int32, sal_Int32& ) override {return -1;} virtual sal_Int32 SAL_CALL previousCharacters( const OUString&, sal_Int32, - const lang::Locale&, sal_Int16, sal_Int32, sal_Int32& ) - throw(uno::RuntimeException, std::exception) override {return -1;} + const lang::Locale&, sal_Int16, sal_Int32, sal_Int32& ) override {return -1;} virtual i18n::Boundary SAL_CALL previousWord( const OUString&, sal_Int32, - const lang::Locale&, sal_Int16) throw(uno::RuntimeException, std::exception) override + const lang::Locale&, sal_Int16) override { return i18n::Boundary(); } virtual i18n::Boundary SAL_CALL nextWord( const OUString&, sal_Int32, - const lang::Locale&, sal_Int16) throw(uno::RuntimeException, std::exception) override + const lang::Locale&, sal_Int16) override { return i18n::Boundary(); } virtual i18n::Boundary SAL_CALL getWordBoundary( const OUString&, sal_Int32, - const lang::Locale&, sal_Int16, sal_Bool ) - throw(uno::RuntimeException, std::exception) override + const lang::Locale&, sal_Int16, sal_Bool ) override { return i18n::Boundary(); } virtual sal_Bool SAL_CALL isBeginWord( const OUString&, sal_Int32, - const lang::Locale&, sal_Int16 ) throw(uno::RuntimeException, std::exception) override + const lang::Locale&, sal_Int16 ) override { return false; } virtual sal_Bool SAL_CALL isEndWord( const OUString&, sal_Int32, - const lang::Locale& , sal_Int16 ) throw(uno::RuntimeException, std::exception) override + const lang::Locale& , sal_Int16 ) override { return false; } virtual sal_Int16 SAL_CALL getWordType( const OUString&, sal_Int32, - const lang::Locale& ) throw(uno::RuntimeException, std::exception) override + const lang::Locale& ) override { return 0; } virtual sal_Int32 SAL_CALL beginOfSentence( const OUString&, sal_Int32, - const lang::Locale& ) throw(uno::RuntimeException, std::exception) override + const lang::Locale& ) override { return 0; } virtual sal_Int32 SAL_CALL endOfSentence( const OUString& rText, sal_Int32, - const lang::Locale& ) throw(uno::RuntimeException, std::exception) override + const lang::Locale& ) override { return rText.getLength(); } virtual i18n::LineBreakResults SAL_CALL getLineBreak( const OUString&, sal_Int32, const lang::Locale&, sal_Int32, const i18n::LineBreakHyphenationOptions&, - const i18n::LineBreakUserOptions&) - throw(uno::RuntimeException, std::exception) override + const i18n::LineBreakUserOptions&) override { return i18n::LineBreakResults(); } - virtual sal_Int16 SAL_CALL getScriptType( const OUString&, sal_Int32 ) - throw(uno::RuntimeException, std::exception) override { return -1; } + virtual sal_Int16 SAL_CALL getScriptType( const OUString&, sal_Int32 ) override { return -1; } virtual sal_Int32 SAL_CALL beginOfScript( const OUString&, sal_Int32, - sal_Int16 ) throw(uno::RuntimeException, std::exception) override { return -1; } + sal_Int16 ) override { return -1; } virtual sal_Int32 SAL_CALL endOfScript( const OUString&, sal_Int32, - sal_Int16 ) throw(uno::RuntimeException, std::exception) override { return -1; } + sal_Int16 ) override { return -1; } virtual sal_Int32 SAL_CALL previousScript( const OUString&, sal_Int32, - sal_Int16 ) throw(uno::RuntimeException, std::exception) override { return -1; } + sal_Int16 ) override { return -1; } virtual sal_Int32 SAL_CALL nextScript( const OUString&, sal_Int32, - sal_Int16 ) throw(uno::RuntimeException, std::exception) override { return -1; } + sal_Int16 ) override { return -1; } virtual sal_Int32 SAL_CALL beginOfCharBlock( const OUString&, sal_Int32, - const lang::Locale&, sal_Int16 ) throw(uno::RuntimeException, std::exception) override { return -1; } + const lang::Locale&, sal_Int16 ) override { return -1; } virtual sal_Int32 SAL_CALL endOfCharBlock( const OUString& rText, sal_Int32 nStartPos, - const lang::Locale&, sal_Int16 CharType ) throw(uno::RuntimeException, std::exception) override + const lang::Locale&, sal_Int16 CharType ) override { const sal_Unicode *pStr = rText.getStr()+nStartPos; for (sal_Int32 nI = nStartPos; nI < rText.getLength(); ++nI) @@ -194,9 +186,9 @@ public: return -1; } virtual sal_Int32 SAL_CALL previousCharBlock( const OUString&, sal_Int32, - const lang::Locale&, sal_Int16 ) throw(uno::RuntimeException, std::exception) override { return -1; } + const lang::Locale&, sal_Int16 ) override { return -1; } virtual sal_Int32 SAL_CALL nextCharBlock( const OUString& rText, sal_Int32 nStartPos, - const lang::Locale&, sal_Int16 CharType ) throw(uno::RuntimeException, std::exception) override + const lang::Locale&, sal_Int16 CharType ) override { const sal_Unicode *pStr = rText.getStr()+nStartPos; for (sal_Int32 nI = nStartPos; nI < rText.getLength(); ++nI) diff --git a/comphelper/source/compare/AnyCompareFactory.cxx b/comphelper/source/compare/AnyCompareFactory.cxx index 4a0bbc3eeb72..c3df018c14ee 100644 --- a/comphelper/source/compare/AnyCompareFactory.cxx +++ b/comphelper/source/compare/AnyCompareFactory.cxx @@ -48,7 +48,7 @@ public: 0 ); //??? } - virtual sal_Int16 SAL_CALL compare( const Any& any1, const Any& any2 ) throw(RuntimeException, std::exception) override; + virtual sal_Int16 SAL_CALL compare( const Any& any1, const Any& any2 ) override; }; class AnyCompareFactory : public cppu::WeakImplHelper< XAnyCompareFactory, XInitialization, XServiceInfo > @@ -62,19 +62,18 @@ public: {} // XAnyCompareFactory - virtual Reference< XAnyCompare > SAL_CALL createAnyCompareByName ( const OUString& aPropertyName ) throw(css::uno::RuntimeException, std::exception) override; + virtual Reference< XAnyCompare > SAL_CALL createAnyCompareByName ( const OUString& aPropertyName ) override; // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) - throw ( Exception, RuntimeException, std::exception ) override; + virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) override; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; -sal_Int16 SAL_CALL AnyCompare::compare( const Any& any1, const Any& any2 ) throw(css::uno::RuntimeException, std::exception) +sal_Int16 SAL_CALL AnyCompare::compare( const Any& any1, const Any& any2 ) { sal_Int16 aResult = 0; @@ -89,7 +88,7 @@ sal_Int16 SAL_CALL AnyCompare::compare( const Any& any1, const Any& any2 ) throw return aResult; } -Reference< XAnyCompare > SAL_CALL AnyCompareFactory::createAnyCompareByName( const OUString& aPropertyName ) throw(css::uno::RuntimeException, std::exception) +Reference< XAnyCompare > SAL_CALL AnyCompareFactory::createAnyCompareByName( const OUString& aPropertyName ) { // for now only OUString properties compare is implemented // so no check for the property name is done @@ -100,7 +99,7 @@ Reference< XAnyCompare > SAL_CALL AnyCompareFactory::createAnyCompareByName( con return Reference< XAnyCompare >(); } -void SAL_CALL AnyCompareFactory::initialize( const Sequence< Any >& aArguments ) throw ( Exception, RuntimeException, std::exception ) +void SAL_CALL AnyCompareFactory::initialize( const Sequence< Any >& aArguments ) { if( aArguments.getLength() ) { @@ -112,17 +111,17 @@ void SAL_CALL AnyCompareFactory::initialize( const Sequence< Any >& aArguments ) } } -OUString SAL_CALL AnyCompareFactory::getImplementationName( ) throw( RuntimeException, std::exception ) +OUString SAL_CALL AnyCompareFactory::getImplementationName( ) { return OUString( "AnyCompareFactory" ); } -sal_Bool SAL_CALL AnyCompareFactory::supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL AnyCompareFactory::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } -Sequence< OUString > SAL_CALL AnyCompareFactory::getSupportedServiceNames( ) throw(RuntimeException, std::exception) +Sequence< OUString > SAL_CALL AnyCompareFactory::getSupportedServiceNames( ) { const OUString aServiceName( "com.sun.star.ucb.AnyCompareFactory" ); const Sequence< OUString > aSeq( &aServiceName, 1 ); diff --git a/comphelper/source/container/IndexedPropertyValuesContainer.cxx b/comphelper/source/container/IndexedPropertyValuesContainer.cxx index 803b171dbf1e..9bc88a408d43 100644 --- a/comphelper/source/container/IndexedPropertyValuesContainer.cxx +++ b/comphelper/source/container/IndexedPropertyValuesContainer.cxx @@ -37,35 +37,24 @@ public: IndexedPropertyValuesContainer() throw(); // XIndexContainer - virtual void SAL_CALL insertByIndex( sal_Int32 nIndex, const css::uno::Any& aElement ) - throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) - throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByIndex( sal_Int32 nIndex, const css::uno::Any& aElement ) override; + virtual void SAL_CALL removeByIndex( sal_Int32 nIndex ) override; // XIndexReplace - virtual void SAL_CALL replaceByIndex( sal_Int32 nIndex, const css::uno::Any& aElement ) - throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByIndex( sal_Int32 nIndex, const css::uno::Any& aElement ) override; // XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) - throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) - throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getCount( ) override; + virtual css::uno::Any SAL_CALL getByIndex( sal_Int32 nIndex ) override; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType( ) - throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; private: IndexedPropertyValues maProperties; @@ -77,8 +66,6 @@ IndexedPropertyValuesContainer::IndexedPropertyValuesContainer() throw() // XIndexContainer void SAL_CALL IndexedPropertyValuesContainer::insertByIndex( sal_Int32 nIndex, const css::uno::Any& aElement ) - throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { sal_Int32 nSize(maProperties.size()); if ((nSize >= nIndex) && (nIndex >= 0)) @@ -119,8 +106,6 @@ void SAL_CALL IndexedPropertyValuesContainer::insertByIndex( sal_Int32 nIndex, c } void SAL_CALL IndexedPropertyValuesContainer::removeByIndex( sal_Int32 nIndex ) - throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { sal_Int32 nSize(maProperties.size()); if ((nIndex < nSize) && (nIndex >= 0)) @@ -154,8 +139,6 @@ void SAL_CALL IndexedPropertyValuesContainer::removeByIndex( sal_Int32 nIndex ) // XIndexReplace void SAL_CALL IndexedPropertyValuesContainer::replaceByIndex( sal_Int32 nIndex, const css::uno::Any& aElement ) - throw(css::lang::IllegalArgumentException, css::lang::IndexOutOfBoundsException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { sal_Int32 nSize(maProperties.size()); if ((nIndex < nSize) && (nIndex >= 0)) @@ -171,14 +154,11 @@ void SAL_CALL IndexedPropertyValuesContainer::replaceByIndex( sal_Int32 nIndex, // XIndexAccess sal_Int32 SAL_CALL IndexedPropertyValuesContainer::getCount( ) - throw(css::uno::RuntimeException, std::exception) { return maProperties.size(); } css::uno::Any SAL_CALL IndexedPropertyValuesContainer::getByIndex( sal_Int32 nIndex ) - throw(css::lang::IndexOutOfBoundsException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { sal_Int32 nSize(maProperties.size()); if (!((nIndex < nSize) && (nIndex >= 0))) @@ -189,29 +169,27 @@ css::uno::Any SAL_CALL IndexedPropertyValuesContainer::getByIndex( sal_Int32 nIn // XElementAccess css::uno::Type SAL_CALL IndexedPropertyValuesContainer::getElementType( ) - throw(css::uno::RuntimeException, std::exception) { return cppu::UnoType>::get(); } sal_Bool SAL_CALL IndexedPropertyValuesContainer::hasElements( ) - throw(css::uno::RuntimeException, std::exception) { return !maProperties.empty(); } //XServiceInfo -OUString SAL_CALL IndexedPropertyValuesContainer::getImplementationName( ) throw(css::uno::RuntimeException, std::exception) +OUString SAL_CALL IndexedPropertyValuesContainer::getImplementationName( ) { return OUString( "IndexedPropertyValuesContainer" ); } -sal_Bool SAL_CALL IndexedPropertyValuesContainer::supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL IndexedPropertyValuesContainer::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } -css::uno::Sequence< OUString > SAL_CALL IndexedPropertyValuesContainer::getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) +css::uno::Sequence< OUString > SAL_CALL IndexedPropertyValuesContainer::getSupportedServiceNames( ) { const OUString aServiceName( "com.sun.star.document.IndexedPropertyValues" ); const uno::Sequence< OUString > aSeq( &aServiceName, 1 ); diff --git a/comphelper/source/container/NamedPropertyValuesContainer.cxx b/comphelper/source/container/NamedPropertyValuesContainer.cxx index 4ac5b42fb5f5..7e72ccce808e 100644 --- a/comphelper/source/container/NamedPropertyValuesContainer.cxx +++ b/comphelper/source/container/NamedPropertyValuesContainer.cxx @@ -38,37 +38,25 @@ public: NamedPropertyValuesContainer() throw(); // XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) - throw(css::lang::IllegalArgumentException, css::container::ElementExistException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByName( const OUString& Name ) - throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) override; + virtual void SAL_CALL removeByName( const OUString& Name ) override; // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) - throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override; // XNameAccess - virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) - throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) - throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; // XElementAccess - virtual css::uno::Type SAL_CALL getElementType( ) - throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; //XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; private: NamedPropertyValues maProperties; @@ -80,8 +68,6 @@ NamedPropertyValuesContainer::NamedPropertyValuesContainer() throw() // XNameContainer void SAL_CALL NamedPropertyValuesContainer::insertByName( const OUString& aName, const uno::Any& aElement ) - throw(css::lang::IllegalArgumentException, css::container::ElementExistException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { if( maProperties.find( aName ) != maProperties.end() ) throw container::ElementExistException(); @@ -94,8 +80,6 @@ void SAL_CALL NamedPropertyValuesContainer::insertByName( const OUString& aName, } void SAL_CALL NamedPropertyValuesContainer::removeByName( const OUString& Name ) - throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { NamedPropertyValues::iterator aIter = maProperties.find( Name ); if( aIter == maProperties.end() ) @@ -106,8 +90,6 @@ void SAL_CALL NamedPropertyValuesContainer::removeByName( const OUString& Name ) // XNameReplace void SAL_CALL NamedPropertyValuesContainer::replaceByName( const OUString& aName, const css::uno::Any& aElement ) - throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { NamedPropertyValues::iterator aIter = maProperties.find( aName ); if( aIter == maProperties.end() ) @@ -122,8 +104,6 @@ void SAL_CALL NamedPropertyValuesContainer::replaceByName( const OUString& aName // XNameAccess css::uno::Any SAL_CALL NamedPropertyValuesContainer::getByName( const OUString& aName ) - throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { NamedPropertyValues::iterator aIter = maProperties.find( aName ); if( aIter == maProperties.end() ) @@ -137,13 +117,11 @@ css::uno::Any SAL_CALL NamedPropertyValuesContainer::getByName( const OUString& } css::uno::Sequence< OUString > SAL_CALL NamedPropertyValuesContainer::getElementNames( ) - throw(css::uno::RuntimeException, std::exception) { return comphelper::mapKeysToSequence(maProperties); } sal_Bool SAL_CALL NamedPropertyValuesContainer::hasByName( const OUString& aName ) - throw(css::uno::RuntimeException, std::exception) { NamedPropertyValues::iterator aIter = maProperties.find( aName ); return aIter != maProperties.end(); @@ -151,29 +129,27 @@ sal_Bool SAL_CALL NamedPropertyValuesContainer::hasByName( const OUString& aName // XElementAccess css::uno::Type SAL_CALL NamedPropertyValuesContainer::getElementType( ) - throw(css::uno::RuntimeException, std::exception) { return cppu::UnoType>::get(); } sal_Bool SAL_CALL NamedPropertyValuesContainer::hasElements( ) - throw(css::uno::RuntimeException, std::exception) { return !maProperties.empty(); } //XServiceInfo -OUString SAL_CALL NamedPropertyValuesContainer::getImplementationName( ) throw(css::uno::RuntimeException, std::exception) +OUString SAL_CALL NamedPropertyValuesContainer::getImplementationName( ) { return OUString( "NamedPropertyValuesContainer" ); } -sal_Bool SAL_CALL NamedPropertyValuesContainer::supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL NamedPropertyValuesContainer::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } -css::uno::Sequence< OUString > SAL_CALL NamedPropertyValuesContainer::getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) +css::uno::Sequence< OUString > SAL_CALL NamedPropertyValuesContainer::getSupportedServiceNames( ) { const OUString aServiceName( "com.sun.star.document.NamedPropertyValues" ); const uno::Sequence< OUString > aSeq( &aServiceName, 1 ); diff --git a/comphelper/source/container/containermultiplexer.cxx b/comphelper/source/container/containermultiplexer.cxx index e80f550bb02e..ae37e3a311ef 100644 --- a/comphelper/source/container/containermultiplexer.cxx +++ b/comphelper/source/container/containermultiplexer.cxx @@ -44,25 +44,21 @@ namespace comphelper void OContainerListener::_elementInserted( const ContainerEvent& /*_rEvent*/ ) - throw (RuntimeException, std::exception) { } void OContainerListener::_elementRemoved( const ContainerEvent& ) - throw (RuntimeException, std::exception) { } void OContainerListener::_elementReplaced( const ContainerEvent& /*_rEvent*/ ) - throw (RuntimeException, std::exception) { } void OContainerListener::_disposing(const EventObject& ) - throw (RuntimeException, std::exception) { } @@ -119,7 +115,7 @@ namespace comphelper } - void SAL_CALL OContainerListenerAdapter::disposing( const EventObject& _rSource) throw(RuntimeException, std::exception) + void SAL_CALL OContainerListenerAdapter::disposing( const EventObject& _rSource) { if (m_pListener) { @@ -135,21 +131,21 @@ namespace comphelper } - void SAL_CALL OContainerListenerAdapter::elementInserted( const ContainerEvent& _rEvent ) throw(RuntimeException, std::exception) + void SAL_CALL OContainerListenerAdapter::elementInserted( const ContainerEvent& _rEvent ) { if (m_pListener) m_pListener->_elementInserted(_rEvent); } - void SAL_CALL OContainerListenerAdapter::elementRemoved( const ContainerEvent& _rEvent ) throw(RuntimeException, std::exception) + void SAL_CALL OContainerListenerAdapter::elementRemoved( const ContainerEvent& _rEvent ) { if (m_pListener) m_pListener->_elementRemoved(_rEvent); } - void SAL_CALL OContainerListenerAdapter::elementReplaced( const ContainerEvent& _rEvent ) throw(RuntimeException, std::exception) + void SAL_CALL OContainerListenerAdapter::elementReplaced( const ContainerEvent& _rEvent ) { if (m_pListener) m_pListener->_elementReplaced(_rEvent); diff --git a/comphelper/source/container/enumerablemap.cxx b/comphelper/source/container/enumerablemap.cxx index 1dc23292d1e7..69e89760e531 100644 --- a/comphelper/source/container/enumerablemap.cxx +++ b/comphelper/source/container/enumerablemap.cxx @@ -155,31 +155,31 @@ namespace comphelper virtual ~EnumerableMap() override; // XInitialization - virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) throw (Exception, RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const Sequence< Any >& aArguments ) override; // XEnumerableMap - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createKeyEnumeration( sal_Bool Isolated ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createValueEnumeration( sal_Bool Isolated ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createElementEnumeration( sal_Bool Isolated ) throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createKeyEnumeration( sal_Bool Isolated ) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createValueEnumeration( sal_Bool Isolated ) override; + virtual css::uno::Reference< css::container::XEnumeration > SAL_CALL createElementEnumeration( sal_Bool Isolated ) override; // XMap - virtual Type SAL_CALL getKeyType() throw (RuntimeException, std::exception) override; - virtual Type SAL_CALL getValueType() throw (RuntimeException, std::exception) override; - virtual void SAL_CALL clear( ) throw (NoSupportException, RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL containsKey( const Any& _key ) throw (IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL containsValue( const Any& _value ) throw (IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception) override; - virtual Any SAL_CALL get( const Any& _key ) throw (IllegalTypeException, IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) override; - virtual Any SAL_CALL put( const Any& _key, const Any& _value ) throw (NoSupportException, IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception) override; - virtual Any SAL_CALL remove( const Any& _key ) throw (NoSupportException, IllegalTypeException, IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) override; + virtual Type SAL_CALL getKeyType() override; + virtual Type SAL_CALL getValueType() override; + virtual void SAL_CALL clear( ) override; + virtual sal_Bool SAL_CALL containsKey( const Any& _key ) override; + virtual sal_Bool SAL_CALL containsValue( const Any& _value ) override; + virtual Any SAL_CALL get( const Any& _key ) override; + virtual Any SAL_CALL put( const Any& _key, const Any& _value ) override; + virtual Any SAL_CALL remove( const Any& _key ) override; // XElementAccess (base of XMap) - virtual Type SAL_CALL getElementType() throw (RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements() throw (RuntimeException, std::exception) override; + virtual Type SAL_CALL getElementType() override; + virtual sal_Bool SAL_CALL hasElements() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException, std::exception) override; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; public: // XServiceInfo, static version (used for component registration) @@ -278,8 +278,8 @@ namespace comphelper } // XEnumeration - virtual sal_Bool SAL_CALL hasMoreElements( ) throw (RuntimeException, std::exception) override; - virtual Any SAL_CALL nextElement( ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasMoreElements( ) override; + virtual Any SAL_CALL nextElement( ) override; protected: virtual ~MapEnumeration() override @@ -317,7 +317,7 @@ namespace comphelper } - void SAL_CALL EnumerableMap::initialize( const Sequence< Any >& _arguments ) throw (Exception, RuntimeException, std::exception) + void SAL_CALL EnumerableMap::initialize( const Sequence< Any >& _arguments ) { ComponentMethodGuard aGuard( *this, ComponentMethodGuard::MethodType::WithoutInit ); if ( impl_isInitialized_nothrow() ) @@ -496,42 +496,42 @@ namespace comphelper } - Reference< XEnumeration > SAL_CALL EnumerableMap::createKeyEnumeration( sal_Bool Isolated ) throw (NoSupportException, RuntimeException, std::exception) + Reference< XEnumeration > SAL_CALL EnumerableMap::createKeyEnumeration( sal_Bool Isolated ) { ComponentMethodGuard aGuard( *this ); return new MapEnumeration( *this, m_aData, getBroadcastHelper(), eKeys, Isolated ); } - Reference< XEnumeration > SAL_CALL EnumerableMap::createValueEnumeration( sal_Bool Isolated ) throw (NoSupportException, RuntimeException, std::exception) + Reference< XEnumeration > SAL_CALL EnumerableMap::createValueEnumeration( sal_Bool Isolated ) { ComponentMethodGuard aGuard( *this ); return new MapEnumeration( *this, m_aData, getBroadcastHelper(), eValues, Isolated ); } - Reference< XEnumeration > SAL_CALL EnumerableMap::createElementEnumeration( sal_Bool Isolated ) throw (NoSupportException, RuntimeException, std::exception) + Reference< XEnumeration > SAL_CALL EnumerableMap::createElementEnumeration( sal_Bool Isolated ) { ComponentMethodGuard aGuard( *this ); return new MapEnumeration( *this, m_aData, getBroadcastHelper(), eBoth, Isolated ); } - Type SAL_CALL EnumerableMap::getKeyType() throw (RuntimeException, std::exception) + Type SAL_CALL EnumerableMap::getKeyType() { ComponentMethodGuard aGuard( *this ); return m_aData.m_aKeyType; } - Type SAL_CALL EnumerableMap::getValueType() throw (RuntimeException, std::exception) + Type SAL_CALL EnumerableMap::getValueType() { ComponentMethodGuard aGuard( *this ); return m_aData.m_aValueType; } - void SAL_CALL EnumerableMap::clear( ) throw (NoSupportException, RuntimeException, std::exception) + void SAL_CALL EnumerableMap::clear( ) { ComponentMethodGuard aGuard( *this ); impl_checkMutable_throw(); @@ -542,7 +542,7 @@ namespace comphelper } - sal_Bool SAL_CALL EnumerableMap::containsKey( const Any& _key ) throw (IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception) + sal_Bool SAL_CALL EnumerableMap::containsKey( const Any& _key ) { ComponentMethodGuard aGuard( *this ); impl_checkKey_throw( _key ); @@ -552,7 +552,7 @@ namespace comphelper } - sal_Bool SAL_CALL EnumerableMap::containsValue( const Any& _value ) throw (IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception) + sal_Bool SAL_CALL EnumerableMap::containsValue( const Any& _value ) { ComponentMethodGuard aGuard( *this ); impl_checkValue_throw( _value ); @@ -569,7 +569,7 @@ namespace comphelper } - Any SAL_CALL EnumerableMap::get( const Any& _key ) throw (IllegalTypeException, IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) + Any SAL_CALL EnumerableMap::get( const Any& _key ) { ComponentMethodGuard aGuard( *this ); impl_checkKey_throw( _key ); @@ -582,7 +582,7 @@ namespace comphelper } - Any SAL_CALL EnumerableMap::put( const Any& _key, const Any& _value ) throw (NoSupportException, IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception) + Any SAL_CALL EnumerableMap::put( const Any& _key, const Any& _value ) { ComponentMethodGuard aGuard( *this ); impl_checkMutable_throw(); @@ -608,7 +608,7 @@ namespace comphelper } - Any SAL_CALL EnumerableMap::remove( const Any& _key ) throw (NoSupportException, IllegalTypeException, IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) + Any SAL_CALL EnumerableMap::remove( const Any& _key ) { ComponentMethodGuard aGuard( *this ); impl_checkMutable_throw(); @@ -629,31 +629,31 @@ namespace comphelper } - Type SAL_CALL EnumerableMap::getElementType() throw (RuntimeException, std::exception) + Type SAL_CALL EnumerableMap::getElementType() { return ::cppu::UnoType< Pair< Any, Any > >::get(); } - sal_Bool SAL_CALL EnumerableMap::hasElements() throw (RuntimeException, std::exception) + sal_Bool SAL_CALL EnumerableMap::hasElements() { ComponentMethodGuard aGuard( *this ); return m_aData.m_pValues->empty(); } - OUString SAL_CALL EnumerableMap::getImplementationName( ) throw (RuntimeException, std::exception) + OUString SAL_CALL EnumerableMap::getImplementationName( ) { return getImplementationName_static(); } - sal_Bool SAL_CALL EnumerableMap::supportsService( const OUString& _serviceName ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL EnumerableMap::supportsService( const OUString& _serviceName ) { return cppu::supportsService(this, _serviceName); } - Sequence< OUString > SAL_CALL EnumerableMap::getSupportedServiceNames( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL EnumerableMap::getSupportedServiceNames( ) { return getSupportedServiceNames_static(); } @@ -711,14 +711,14 @@ namespace comphelper } - sal_Bool SAL_CALL MapEnumeration::hasMoreElements( ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL MapEnumeration::hasMoreElements( ) { ComponentMethodGuard aGuard( *this ); return m_aEnumerator.hasMoreElements(); } - Any SAL_CALL MapEnumeration::nextElement( ) throw (NoSuchElementException, WrappedTargetException, RuntimeException, std::exception) + Any SAL_CALL MapEnumeration::nextElement( ) { ComponentMethodGuard aGuard( *this ); return m_aEnumerator.nextElement(); diff --git a/comphelper/source/container/enumhelper.cxx b/comphelper/source/container/enumhelper.cxx index d501dd9dadd5..c5e49a6555c8 100644 --- a/comphelper/source/container/enumhelper.cxx +++ b/comphelper/source/container/enumhelper.cxx @@ -51,7 +51,7 @@ OEnumerationByName::~OEnumerationByName() } -sal_Bool SAL_CALL OEnumerationByName::hasMoreElements( ) throw(css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL OEnumerationByName::hasMoreElements( ) { ::osl::ResettableMutexGuard aLock(m_aLock); @@ -69,7 +69,6 @@ sal_Bool SAL_CALL OEnumerationByName::hasMoreElements( ) throw(css::uno::Runtim css::uno::Any SAL_CALL OEnumerationByName::nextElement( ) - throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { ::osl::ResettableMutexGuard aLock(m_aLock); @@ -91,7 +90,6 @@ css::uno::Any SAL_CALL OEnumerationByName::nextElement( ) void SAL_CALL OEnumerationByName::disposing(const css::lang::EventObject& aEvent) - throw(css::uno::RuntimeException, std::exception) { ::osl::ResettableMutexGuard aLock(m_aLock); @@ -150,7 +148,7 @@ OEnumerationByIndex::~OEnumerationByIndex() } -sal_Bool SAL_CALL OEnumerationByIndex::hasMoreElements( ) throw(css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL OEnumerationByIndex::hasMoreElements( ) { ::osl::ResettableMutexGuard aLock(m_aLock); @@ -168,7 +166,6 @@ sal_Bool SAL_CALL OEnumerationByIndex::hasMoreElements( ) throw(css::uno::Runti css::uno::Any SAL_CALL OEnumerationByIndex::nextElement( ) - throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { ::osl::ResettableMutexGuard aLock(m_aLock); @@ -190,7 +187,6 @@ css::uno::Any SAL_CALL OEnumerationByIndex::nextElement( ) void SAL_CALL OEnumerationByIndex::disposing(const css::lang::EventObject& aEvent) - throw(css::uno::RuntimeException, std::exception) { ::osl::ResettableMutexGuard aLock(m_aLock); @@ -246,7 +242,7 @@ OAnyEnumeration::~OAnyEnumeration() } -sal_Bool SAL_CALL OAnyEnumeration::hasMoreElements( ) throw(css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL OAnyEnumeration::hasMoreElements( ) { ::osl::ResettableMutexGuard aLock(m_aLock); @@ -255,7 +251,6 @@ sal_Bool SAL_CALL OAnyEnumeration::hasMoreElements( ) throw(css::uno::RuntimeEx css::uno::Any SAL_CALL OAnyEnumeration::nextElement( ) - throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { if ( ! hasMoreElements()) throw css::container::NoSuchElementException(); diff --git a/comphelper/source/container/namecontainer.cxx b/comphelper/source/container/namecontainer.cxx index 0332cd29f90c..ed10fbb72076 100644 --- a/comphelper/source/container/namecontainer.cxx +++ b/comphelper/source/container/namecontainer.cxx @@ -38,32 +38,20 @@ namespace comphelper explicit NameContainer( css::uno::Type aType ); // XNameContainer - virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) - throw(css::lang::IllegalArgumentException, css::container::ElementExistException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeByName( const OUString& Name ) - throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertByName( const OUString& aName, const css::uno::Any& aElement ) override; + virtual void SAL_CALL removeByName( const OUString& Name ) override; // XNameReplace - virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) - throw(css::lang::IllegalArgumentException, css::container::NoSuchElementException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL replaceByName( const OUString& aName, const css::uno::Any& aElement ) override; // XNameAccess - virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) - throw(css::container::NoSuchElementException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) - throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) - throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getByName( const OUString& aName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getElementNames( ) override; + virtual sal_Bool SAL_CALL hasByName( const OUString& aName ) override; // XElementAccess - virtual sal_Bool SAL_CALL hasElements( ) - throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Type SAL_CALL getElementType( ) - throw(css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements( ) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; private: SvGenericNameContainerMapImpl maProperties; @@ -86,8 +74,6 @@ NameContainer::NameContainer( css::uno::Type aType ) // XNameContainer void SAL_CALL NameContainer::insertByName( const OUString& aName, const Any& aElement ) - throw(IllegalArgumentException, ElementExistException, - WrappedTargetException, RuntimeException, std::exception) { MutexGuard aGuard( maMutex ); @@ -101,8 +87,6 @@ void SAL_CALL NameContainer::insertByName( const OUString& aName, const Any& aEl } void SAL_CALL NameContainer::removeByName( const OUString& Name ) - throw(NoSuchElementException, WrappedTargetException, - RuntimeException, std::exception) { MutexGuard aGuard( maMutex ); @@ -116,8 +100,6 @@ void SAL_CALL NameContainer::removeByName( const OUString& Name ) // XNameReplace void SAL_CALL NameContainer::replaceByName( const OUString& aName, const Any& aElement ) - throw(IllegalArgumentException, NoSuchElementException, - WrappedTargetException, RuntimeException, std::exception) { MutexGuard aGuard( maMutex ); @@ -134,8 +116,6 @@ void SAL_CALL NameContainer::replaceByName( const OUString& aName, const Any& aE // XNameAccess Any SAL_CALL NameContainer::getByName( const OUString& aName ) - throw(NoSuchElementException, WrappedTargetException, - RuntimeException, std::exception) { MutexGuard aGuard( maMutex ); @@ -147,7 +127,6 @@ Any SAL_CALL NameContainer::getByName( const OUString& aName ) } Sequence< OUString > SAL_CALL NameContainer::getElementNames( ) - throw(RuntimeException, std::exception) { MutexGuard aGuard( maMutex ); @@ -155,7 +134,6 @@ Sequence< OUString > SAL_CALL NameContainer::getElementNames( ) } sal_Bool SAL_CALL NameContainer::hasByName( const OUString& aName ) - throw(RuntimeException, std::exception) { MutexGuard aGuard( maMutex ); @@ -164,7 +142,6 @@ sal_Bool SAL_CALL NameContainer::hasByName( const OUString& aName ) } sal_Bool SAL_CALL NameContainer::hasElements( ) - throw(RuntimeException, std::exception) { MutexGuard aGuard( maMutex ); @@ -172,7 +149,6 @@ sal_Bool SAL_CALL NameContainer::hasElements( ) } Type SAL_CALL NameContainer::getElementType() - throw( RuntimeException, std::exception ) { return maType; } diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx index 6917380aa7b9..06b23432bbe9 100644 --- a/comphelper/source/eventattachermgr/eventattachermgr.cxx +++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx @@ -98,37 +98,26 @@ public: const Reference< XComponentContext >& rContext ); // Methods of XEventAttacherManager - virtual void SAL_CALL registerScriptEvent(sal_Int32 Index, const ScriptEventDescriptor& ScriptEvent) - throw( IllegalArgumentException, RuntimeException, std::exception ) override; - virtual void SAL_CALL registerScriptEvents(sal_Int32 Index, const Sequence< ScriptEventDescriptor >& ScriptEvents) - throw( IllegalArgumentException, RuntimeException, std::exception ) override; - virtual void SAL_CALL revokeScriptEvent(sal_Int32 Index, const OUString& ListenerType, const OUString& EventMethod, const OUString& removeListenerParam) - throw( IllegalArgumentException, RuntimeException, std::exception ) override; - virtual void SAL_CALL revokeScriptEvents(sal_Int32 Index) - throw( IllegalArgumentException, RuntimeException, std::exception ) override; - virtual void SAL_CALL insertEntry(sal_Int32 Index) - throw( IllegalArgumentException, RuntimeException, std::exception ) override; - virtual void SAL_CALL removeEntry(sal_Int32 Index) - throw( IllegalArgumentException, RuntimeException, std::exception ) override; - virtual Sequence< ScriptEventDescriptor > SAL_CALL getScriptEvents(sal_Int32 Index) - throw( IllegalArgumentException, RuntimeException, std::exception ) override; - virtual void SAL_CALL attach(sal_Int32 Index, const Reference< XInterface >& Object, const Any& Helper) - throw( IllegalArgumentException, ServiceNotRegisteredException, RuntimeException, std::exception ) override; - virtual void SAL_CALL detach(sal_Int32 nIndex, const Reference< XInterface >& xObject) - throw( IllegalArgumentException, RuntimeException, std::exception ) override; - virtual void SAL_CALL addScriptListener(const Reference< XScriptListener >& aListener) - throw( IllegalArgumentException, RuntimeException, std::exception ) override; - virtual void SAL_CALL removeScriptListener(const Reference< XScriptListener >& Listener) - throw( IllegalArgumentException, RuntimeException, std::exception ) override; + virtual void SAL_CALL registerScriptEvent(sal_Int32 Index, const ScriptEventDescriptor& ScriptEvent) override; + virtual void SAL_CALL registerScriptEvents(sal_Int32 Index, const Sequence< ScriptEventDescriptor >& ScriptEvents) override; + virtual void SAL_CALL revokeScriptEvent(sal_Int32 Index, const OUString& ListenerType, const OUString& EventMethod, const OUString& removeListenerParam) override; + virtual void SAL_CALL revokeScriptEvents(sal_Int32 Index) override; + virtual void SAL_CALL insertEntry(sal_Int32 Index) override; + virtual void SAL_CALL removeEntry(sal_Int32 Index) override; + virtual Sequence< ScriptEventDescriptor > SAL_CALL getScriptEvents(sal_Int32 Index) override; + virtual void SAL_CALL attach(sal_Int32 Index, const Reference< XInterface >& Object, const Any& Helper) override; + virtual void SAL_CALL detach(sal_Int32 nIndex, const Reference< XInterface >& xObject) override; + virtual void SAL_CALL addScriptListener(const Reference< XScriptListener >& aListener) override; + virtual void SAL_CALL removeScriptListener(const Reference< XScriptListener >& Listener) override; // Methods of XPersistObject - virtual OUString SAL_CALL getServiceName() throw( RuntimeException, std::exception ) override; - virtual void SAL_CALL write(const Reference< XObjectOutputStream >& OutStream) throw( IOException, RuntimeException, std::exception ) override; - virtual void SAL_CALL read(const Reference< XObjectInputStream >& InStream) throw( IOException, RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getServiceName() override; + virtual void SAL_CALL write(const Reference< XObjectOutputStream >& OutStream) override; + virtual void SAL_CALL read(const Reference< XObjectInputStream >& InStream) override; private: /// @throws Exception - Reference< XIdlReflection > getReflection() throw( Exception ); + Reference< XIdlReflection > getReflection(); /** checks if _nIndex is a valid index, throws an IllegalArgumentException if not @param _nIndex @@ -149,18 +138,17 @@ class AttacherAllListener_Impl : public WeakImplHelper< XAllListener > OUString aScriptCode; /// @throws CannotConvertException - void convertToEventReturn( Any & rRet, const Type & rRetType ) - throw( CannotConvertException ); + void convertToEventReturn( Any & rRet, const Type & rRetType ); public: AttacherAllListener_Impl( ImplEventAttacherManager* pManager_, const OUString &rScriptType_, const OUString & rScriptCode_ ); // Methods of XAllListener - virtual void SAL_CALL firing(const AllEventObject& Event) throw( RuntimeException, std::exception ) override; - virtual Any SAL_CALL approveFiring(const AllEventObject& Event) throw( InvocationTargetException, RuntimeException, std::exception ) override; + virtual void SAL_CALL firing(const AllEventObject& Event) override; + virtual Any SAL_CALL approveFiring(const AllEventObject& Event) override; // Methods of XEventListener - virtual void SAL_CALL disposing(const EventObject& Source) throw( RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing(const EventObject& Source) override; }; @@ -179,7 +167,6 @@ AttacherAllListener_Impl::AttacherAllListener_Impl // Methods of XAllListener void SAL_CALL AttacherAllListener_Impl::firing(const AllEventObject& Event) - throw( RuntimeException, std::exception ) { ScriptEvent aScriptEvent; aScriptEvent.Source = static_cast(mxManager.get()); // get correct XInterface @@ -199,7 +186,6 @@ void SAL_CALL AttacherAllListener_Impl::firing(const AllEventObject& Event) // Convert to the standard event return void AttacherAllListener_Impl::convertToEventReturn( Any & rRet, const Type & rRetType ) - throw( CannotConvertException ) { // no return value? Set to the specified values if( rRet.getValueType().getTypeClass() == TypeClass_VOID ) @@ -244,7 +230,6 @@ void AttacherAllListener_Impl::convertToEventReturn( Any & rRet, const Type & rR // Methods of XAllListener Any SAL_CALL AttacherAllListener_Impl::approveFiring( const AllEventObject& Event ) - throw( InvocationTargetException, RuntimeException, std::exception ) { ScriptEvent aScriptEvent; aScriptEvent.Source = static_cast(mxManager.get()); // get correct XInterface @@ -340,14 +325,12 @@ Any SAL_CALL AttacherAllListener_Impl::approveFiring( const AllEventObject& Even // Methods of XEventListener void SAL_CALL AttacherAllListener_Impl::disposing(const EventObject& ) - throw( RuntimeException, std::exception ) { // It is up to the container to release the object } // Constructor method for EventAttacherManager Reference< XEventAttacherManager > createEventAttacherManager( const Reference< XComponentContext > & rxContext ) - throw( Exception ) { Reference< XIntrospection > xIntrospection = theIntrospection::get( rxContext ); return new ImplEventAttacherManager( xIntrospection, rxContext ); @@ -380,7 +363,7 @@ ImplEventAttacherManager::ImplEventAttacherManager( const Reference< XIntrospect } } -Reference< XIdlReflection > ImplEventAttacherManager::getReflection() throw( Exception ) +Reference< XIdlReflection > ImplEventAttacherManager::getReflection() { Guard< Mutex > aGuard( aLock ); // Do we already have a service? If not, create one. @@ -407,7 +390,6 @@ void SAL_CALL ImplEventAttacherManager::registerScriptEvent sal_Int32 nIndex, const ScriptEventDescriptor& ScriptEvent ) - throw( IllegalArgumentException, RuntimeException, std::exception ) { Guard< Mutex > aGuard( aLock ); @@ -445,7 +427,6 @@ void SAL_CALL ImplEventAttacherManager::registerScriptEvents sal_Int32 nIndex, const Sequence< ScriptEventDescriptor >& ScriptEvents ) - throw( IllegalArgumentException, RuntimeException, std::exception ) { Guard< Mutex > aGuard( aLock ); @@ -471,7 +452,6 @@ void SAL_CALL ImplEventAttacherManager::revokeScriptEvent const OUString& EventMethod, const OUString& ToRemoveListenerParam ) - throw( IllegalArgumentException, RuntimeException, std::exception ) { Guard< Mutex > aGuard( aLock ); @@ -506,7 +486,6 @@ void SAL_CALL ImplEventAttacherManager::revokeScriptEvent void SAL_CALL ImplEventAttacherManager::revokeScriptEvents(sal_Int32 nIndex ) - throw( IllegalArgumentException, RuntimeException, std::exception ) { Guard< Mutex > aGuard( aLock ); ::std::deque::iterator aIt = implCheckIndex( nIndex ); @@ -521,7 +500,6 @@ void SAL_CALL ImplEventAttacherManager::revokeScriptEvents(sal_Int32 nIndex ) void SAL_CALL ImplEventAttacherManager::insertEntry(sal_Int32 nIndex) - throw( IllegalArgumentException, RuntimeException, std::exception ) { Guard< Mutex > aGuard( aLock ); if( nIndex < 0 ) @@ -536,7 +514,6 @@ void SAL_CALL ImplEventAttacherManager::insertEntry(sal_Int32 nIndex) void SAL_CALL ImplEventAttacherManager::removeEntry(sal_Int32 nIndex) - throw( IllegalArgumentException, RuntimeException, std::exception ) { Guard< Mutex > aGuard( aLock ); ::std::deque::iterator aIt = implCheckIndex( nIndex ); @@ -550,7 +527,6 @@ void SAL_CALL ImplEventAttacherManager::removeEntry(sal_Int32 nIndex) Sequence< ScriptEventDescriptor > SAL_CALL ImplEventAttacherManager::getScriptEvents(sal_Int32 nIndex) - throw( IllegalArgumentException, RuntimeException, std::exception ) { Guard< Mutex > aGuard( aLock ); ::std::deque::iterator aIt = implCheckIndex( nIndex ); @@ -559,7 +535,6 @@ Sequence< ScriptEventDescriptor > SAL_CALL ImplEventAttacherManager::getScriptEv void SAL_CALL ImplEventAttacherManager::attach(sal_Int32 nIndex, const Reference< XInterface >& xObject, const Any & Helper) - throw( IllegalArgumentException, ServiceNotRegisteredException, RuntimeException, std::exception ) { Guard< Mutex > aGuard( aLock ); if( nIndex < 0 || !xObject.is() ) @@ -621,7 +596,6 @@ void SAL_CALL ImplEventAttacherManager::attach(sal_Int32 nIndex, const Reference void SAL_CALL ImplEventAttacherManager::detach(sal_Int32 nIndex, const Reference< XInterface >& xObject) - throw( IllegalArgumentException, RuntimeException, std::exception ) { Guard< Mutex > aGuard( aLock ); //return; @@ -659,14 +633,12 @@ void SAL_CALL ImplEventAttacherManager::detach(sal_Int32 nIndex, const Reference } void SAL_CALL ImplEventAttacherManager::addScriptListener(const Reference< XScriptListener >& aListener) - throw( IllegalArgumentException, RuntimeException, std::exception ) { Guard< Mutex > aGuard( aLock ); aScriptListeners.addInterface( aListener ); } void SAL_CALL ImplEventAttacherManager::removeScriptListener(const Reference< XScriptListener >& aListener) - throw( IllegalArgumentException, RuntimeException, std::exception ) { Guard< Mutex > aGuard( aLock ); aScriptListeners.removeInterface( aListener ); @@ -675,13 +647,11 @@ void SAL_CALL ImplEventAttacherManager::removeScriptListener(const Reference< XS // Methods of XPersistObject OUString SAL_CALL ImplEventAttacherManager::getServiceName() - throw( RuntimeException, std::exception ) { return OUString( "com.sun.star.uno.script.EventAttacherManager" ); } void SAL_CALL ImplEventAttacherManager::write(const Reference< XObjectOutputStream >& OutStream) - throw( IOException, RuntimeException, std::exception ) { Guard< Mutex > aGuard( aLock ); // Don't run without XMarkableStream @@ -721,7 +691,6 @@ void SAL_CALL ImplEventAttacherManager::write(const Reference< XObjectOutputStre } void SAL_CALL ImplEventAttacherManager::read(const Reference< XObjectInputStream >& InStream) - throw( IOException, RuntimeException, std::exception ) { Guard< Mutex > aGuard( aLock ); // Don't run without XMarkableStream diff --git a/comphelper/source/misc/SelectionMultiplex.cxx b/comphelper/source/misc/SelectionMultiplex.cxx index 15c2c9476b6e..8378304f6520 100644 --- a/comphelper/source/misc/SelectionMultiplex.cxx +++ b/comphelper/source/misc/SelectionMultiplex.cxx @@ -36,7 +36,6 @@ OSelectionChangeListener::~OSelectionChangeListener() void OSelectionChangeListener::_disposing(const EventObject&) - throw (RuntimeException, std::exception) { // nothing to do here } @@ -82,7 +81,7 @@ void OSelectionChangeMultiplexer::unlock() // XEventListener -void SAL_CALL OSelectionChangeMultiplexer::disposing( const EventObject& _rSource) throw( RuntimeException, std::exception) +void SAL_CALL OSelectionChangeMultiplexer::disposing( const EventObject& _rSource) { if (m_pListener) { @@ -101,7 +100,7 @@ void SAL_CALL OSelectionChangeMultiplexer::disposing( const EventObject& _rSour // XSelectionChangeListener -void SAL_CALL OSelectionChangeMultiplexer::selectionChanged( const EventObject& _rEvent ) throw( RuntimeException, std::exception) +void SAL_CALL OSelectionChangeMultiplexer::selectionChanged( const EventObject& _rEvent ) { if (m_pListener && !locked()) m_pListener->_selectionChanged(_rEvent); diff --git a/comphelper/source/misc/accessiblecomponenthelper.cxx b/comphelper/source/misc/accessiblecomponenthelper.cxx index 4d97b8049984..a5211d6f3af9 100644 --- a/comphelper/source/misc/accessiblecomponenthelper.cxx +++ b/comphelper/source/misc/accessiblecomponenthelper.cxx @@ -40,7 +40,7 @@ namespace comphelper } - bool SAL_CALL OCommonAccessibleComponent::containsPoint( const Point& _rPoint ) throw (RuntimeException) + bool SAL_CALL OCommonAccessibleComponent::containsPoint( const Point& _rPoint ) { OExternalLockGuard aGuard( this ); Rectangle aBounds( implGetBounds() ); @@ -51,7 +51,7 @@ namespace comphelper } - Point SAL_CALL OCommonAccessibleComponent::getLocation( ) throw (RuntimeException) + Point SAL_CALL OCommonAccessibleComponent::getLocation( ) { OExternalLockGuard aGuard( this ); Rectangle aBounds( implGetBounds() ); @@ -59,7 +59,7 @@ namespace comphelper } - Point SAL_CALL OCommonAccessibleComponent::getLocationOnScreen( ) throw (RuntimeException) + Point SAL_CALL OCommonAccessibleComponent::getLocationOnScreen( ) { OExternalLockGuard aGuard( this ); @@ -79,7 +79,7 @@ namespace comphelper } - Size SAL_CALL OCommonAccessibleComponent::getSize( ) throw (RuntimeException) + Size SAL_CALL OCommonAccessibleComponent::getSize( ) { OExternalLockGuard aGuard( this ); Rectangle aBounds( implGetBounds() ); @@ -87,7 +87,7 @@ namespace comphelper } - Rectangle SAL_CALL OCommonAccessibleComponent::getBounds( ) throw (RuntimeException) + Rectangle SAL_CALL OCommonAccessibleComponent::getBounds( ) { OExternalLockGuard aGuard( this ); return implGetBounds(); @@ -104,31 +104,31 @@ namespace comphelper // (order matters: the first is the class name, the second is the class doing the ref counting) - sal_Bool SAL_CALL OAccessibleComponentHelper::containsPoint( const Point& _rPoint ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL OAccessibleComponentHelper::containsPoint( const Point& _rPoint ) { return OCommonAccessibleComponent::containsPoint( _rPoint ); } - Point SAL_CALL OAccessibleComponentHelper::getLocation( ) throw (RuntimeException, std::exception) + Point SAL_CALL OAccessibleComponentHelper::getLocation( ) { return OCommonAccessibleComponent::getLocation( ); } - Point SAL_CALL OAccessibleComponentHelper::getLocationOnScreen( ) throw (RuntimeException, std::exception) + Point SAL_CALL OAccessibleComponentHelper::getLocationOnScreen( ) { return OCommonAccessibleComponent::getLocationOnScreen( ); } - Size SAL_CALL OAccessibleComponentHelper::getSize( ) throw (RuntimeException, std::exception) + Size SAL_CALL OAccessibleComponentHelper::getSize( ) { return OCommonAccessibleComponent::getSize( ); } - Rectangle SAL_CALL OAccessibleComponentHelper::getBounds( ) throw (RuntimeException, std::exception) + Rectangle SAL_CALL OAccessibleComponentHelper::getBounds( ) { return OCommonAccessibleComponent::getBounds( ); } @@ -144,31 +144,31 @@ namespace comphelper // (order matters: the first is the class name, the second is the class doing the ref counting) - sal_Bool SAL_CALL OAccessibleExtendedComponentHelper::containsPoint( const Point& _rPoint ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL OAccessibleExtendedComponentHelper::containsPoint( const Point& _rPoint ) { return OCommonAccessibleComponent::containsPoint( _rPoint ); } - Point SAL_CALL OAccessibleExtendedComponentHelper::getLocation( ) throw (RuntimeException, std::exception) + Point SAL_CALL OAccessibleExtendedComponentHelper::getLocation( ) { return OCommonAccessibleComponent::getLocation( ); } - Point SAL_CALL OAccessibleExtendedComponentHelper::getLocationOnScreen( ) throw (RuntimeException, std::exception) + Point SAL_CALL OAccessibleExtendedComponentHelper::getLocationOnScreen( ) { return OCommonAccessibleComponent::getLocationOnScreen( ); } - Size SAL_CALL OAccessibleExtendedComponentHelper::getSize( ) throw (RuntimeException, std::exception) + Size SAL_CALL OAccessibleExtendedComponentHelper::getSize( ) { return OCommonAccessibleComponent::getSize( ); } - Rectangle SAL_CALL OAccessibleExtendedComponentHelper::getBounds( ) throw (RuntimeException, std::exception) + Rectangle SAL_CALL OAccessibleExtendedComponentHelper::getBounds( ) { return OCommonAccessibleComponent::getBounds( ); } diff --git a/comphelper/source/misc/accessiblecontexthelper.cxx b/comphelper/source/misc/accessiblecontexthelper.cxx index bbc4102c10a8..0fa19a2ef05c 100644 --- a/comphelper/source/misc/accessiblecontexthelper.cxx +++ b/comphelper/source/misc/accessiblecontexthelper.cxx @@ -119,7 +119,7 @@ namespace comphelper } - void SAL_CALL OAccessibleContextHelper::addAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) throw (RuntimeException, std::exception) + void SAL_CALL OAccessibleContextHelper::addAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) { OMutexGuard aGuard( getExternalLock() ); // don't use the OContextEntryGuard - it will throw an exception if we're not alive @@ -142,7 +142,7 @@ namespace comphelper } - void SAL_CALL OAccessibleContextHelper::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) throw (RuntimeException, std::exception) + void SAL_CALL OAccessibleContextHelper::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) { OMutexGuard aGuard( getExternalLock() ); // don't use the OContextEntryGuard - it will throw an exception if we're not alive @@ -223,7 +223,7 @@ namespace comphelper } - sal_Int32 SAL_CALL OAccessibleContextHelper::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL OAccessibleContextHelper::getAccessibleIndexInParent( ) { OExternalLockGuard aGuard( this ); @@ -269,7 +269,7 @@ namespace comphelper } - Locale SAL_CALL OAccessibleContextHelper::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) + Locale SAL_CALL OAccessibleContextHelper::getLocale( ) { // simply ask the parent Reference< XAccessible > xParent = getAccessibleParent(); diff --git a/comphelper/source/misc/accessiblekeybindinghelper.cxx b/comphelper/source/misc/accessiblekeybindinghelper.cxx index 72fae780e79f..72ce3b74657c 100644 --- a/comphelper/source/misc/accessiblekeybindinghelper.cxx +++ b/comphelper/source/misc/accessiblekeybindinghelper.cxx @@ -50,7 +50,7 @@ namespace comphelper } - void OAccessibleKeyBindingHelper::AddKeyBinding( const Sequence< awt::KeyStroke >& rKeyBinding ) throw (RuntimeException) + void OAccessibleKeyBindingHelper::AddKeyBinding( const Sequence< awt::KeyStroke >& rKeyBinding ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -58,7 +58,7 @@ namespace comphelper } - void OAccessibleKeyBindingHelper::AddKeyBinding( const awt::KeyStroke& rKeyStroke ) throw (RuntimeException) + void OAccessibleKeyBindingHelper::AddKeyBinding( const awt::KeyStroke& rKeyStroke ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -71,7 +71,7 @@ namespace comphelper // XAccessibleKeyBinding - sal_Int32 OAccessibleKeyBindingHelper::getAccessibleKeyBindingCount() throw (RuntimeException, std::exception) + sal_Int32 OAccessibleKeyBindingHelper::getAccessibleKeyBindingCount() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -79,7 +79,7 @@ namespace comphelper } - Sequence< awt::KeyStroke > OAccessibleKeyBindingHelper::getAccessibleKeyBinding( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + Sequence< awt::KeyStroke > OAccessibleKeyBindingHelper::getAccessibleKeyBinding( sal_Int32 nIndex ) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/comphelper/source/misc/accessibleselectionhelper.cxx b/comphelper/source/misc/accessibleselectionhelper.cxx index 5daa1c2264d1..fe5f47b97482 100644 --- a/comphelper/source/misc/accessibleselectionhelper.cxx +++ b/comphelper/source/misc/accessibleselectionhelper.cxx @@ -36,31 +36,31 @@ namespace comphelper OCommonAccessibleSelection::~OCommonAccessibleSelection() {} - void SAL_CALL OCommonAccessibleSelection::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) + void SAL_CALL OCommonAccessibleSelection::selectAccessibleChild( sal_Int32 nChildIndex ) { implSelect( nChildIndex, true ); } - bool SAL_CALL OCommonAccessibleSelection::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) + bool SAL_CALL OCommonAccessibleSelection::isAccessibleChildSelected( sal_Int32 nChildIndex ) { return implIsSelected( nChildIndex ); } - void SAL_CALL OCommonAccessibleSelection::clearAccessibleSelection( ) throw (RuntimeException) + void SAL_CALL OCommonAccessibleSelection::clearAccessibleSelection( ) { implSelect( ACCESSIBLE_SELECTION_CHILD_ALL, false ); } - void SAL_CALL OCommonAccessibleSelection::selectAllAccessibleChildren( ) throw (RuntimeException) + void SAL_CALL OCommonAccessibleSelection::selectAllAccessibleChildren( ) { implSelect( ACCESSIBLE_SELECTION_CHILD_ALL, true ); } - sal_Int32 SAL_CALL OCommonAccessibleSelection::getSelectedAccessibleChildCount( ) throw (RuntimeException) + sal_Int32 SAL_CALL OCommonAccessibleSelection::getSelectedAccessibleChildCount( ) { sal_Int32 nRet = 0; Reference< XAccessibleContext > xParentContext( implGetAccessibleContext() ); @@ -78,7 +78,7 @@ namespace comphelper } - Reference< XAccessible > SAL_CALL OCommonAccessibleSelection::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) + Reference< XAccessible > SAL_CALL OCommonAccessibleSelection::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) { Reference< XAccessible > xRet; Reference< XAccessibleContext > xParentContext( implGetAccessibleContext() ); @@ -96,7 +96,7 @@ namespace comphelper } - void SAL_CALL OCommonAccessibleSelection::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException) + void SAL_CALL OCommonAccessibleSelection::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) { implSelect( nSelectedChildIndex, false ); } @@ -111,55 +111,55 @@ namespace comphelper // (order matters: the first is the class name, the second is the class doing the ref counting) - Reference< XAccessibleContext > OAccessibleSelectionHelper::implGetAccessibleContext() throw ( RuntimeException ) + Reference< XAccessibleContext > OAccessibleSelectionHelper::implGetAccessibleContext() { return this; } - void SAL_CALL OAccessibleSelectionHelper::selectAccessibleChild( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + void SAL_CALL OAccessibleSelectionHelper::selectAccessibleChild( sal_Int32 nChildIndex ) { OExternalLockGuard aGuard( this ); OCommonAccessibleSelection::selectAccessibleChild( nChildIndex ); } - sal_Bool SAL_CALL OAccessibleSelectionHelper::isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + sal_Bool SAL_CALL OAccessibleSelectionHelper::isAccessibleChildSelected( sal_Int32 nChildIndex ) { OExternalLockGuard aGuard( this ); return OCommonAccessibleSelection::isAccessibleChildSelected( nChildIndex ); } - void SAL_CALL OAccessibleSelectionHelper::clearAccessibleSelection( ) throw (RuntimeException, std::exception) + void SAL_CALL OAccessibleSelectionHelper::clearAccessibleSelection( ) { OExternalLockGuard aGuard( this ); OCommonAccessibleSelection::clearAccessibleSelection(); } - void SAL_CALL OAccessibleSelectionHelper::selectAllAccessibleChildren( ) throw (RuntimeException, std::exception) + void SAL_CALL OAccessibleSelectionHelper::selectAllAccessibleChildren( ) { OExternalLockGuard aGuard( this ); OCommonAccessibleSelection::selectAllAccessibleChildren(); } - sal_Int32 SAL_CALL OAccessibleSelectionHelper::getSelectedAccessibleChildCount( ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL OAccessibleSelectionHelper::getSelectedAccessibleChildCount( ) { OExternalLockGuard aGuard( this ); return OCommonAccessibleSelection::getSelectedAccessibleChildCount(); } - Reference< XAccessible > SAL_CALL OAccessibleSelectionHelper::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + Reference< XAccessible > SAL_CALL OAccessibleSelectionHelper::getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) { OExternalLockGuard aGuard( this ); return OCommonAccessibleSelection::getSelectedAccessibleChild( nSelectedChildIndex ); } - void SAL_CALL OAccessibleSelectionHelper::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + void SAL_CALL OAccessibleSelectionHelper::deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) { OExternalLockGuard aGuard( this ); OCommonAccessibleSelection::deselectAccessibleChild( nSelectedChildIndex ); diff --git a/comphelper/source/misc/accessibletexthelper.cxx b/comphelper/source/misc/accessibletexthelper.cxx index 29ca9c6f8e38..2bb088dc2595 100644 --- a/comphelper/source/misc/accessibletexthelper.cxx +++ b/comphelper/source/misc/accessibletexthelper.cxx @@ -222,7 +222,7 @@ namespace comphelper } - sal_Unicode OCommonAccessibleText::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException) + sal_Unicode OCommonAccessibleText::getCharacter( sal_Int32 nIndex ) { OUString sText( implGetText() ); @@ -233,13 +233,13 @@ namespace comphelper } - sal_Int32 OCommonAccessibleText::getCharacterCount() throw (RuntimeException) + sal_Int32 OCommonAccessibleText::getCharacterCount() { return implGetText().getLength(); } - OUString OCommonAccessibleText::getSelectedText() throw (RuntimeException) + OUString OCommonAccessibleText::getSelectedText() { OUString sText; sal_Int32 nStartIndex; @@ -259,7 +259,7 @@ namespace comphelper } - sal_Int32 OCommonAccessibleText::getSelectionStart() throw (RuntimeException) + sal_Int32 OCommonAccessibleText::getSelectionStart() { sal_Int32 nStartIndex; sal_Int32 nEndIndex; @@ -270,7 +270,7 @@ namespace comphelper } - sal_Int32 OCommonAccessibleText::getSelectionEnd() throw (RuntimeException) + sal_Int32 OCommonAccessibleText::getSelectionEnd() { sal_Int32 nStartIndex; sal_Int32 nEndIndex; @@ -281,13 +281,13 @@ namespace comphelper } - OUString OCommonAccessibleText::getText() throw (RuntimeException) + OUString OCommonAccessibleText::getText() { return implGetText(); } - OUString OCommonAccessibleText::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException) + OUString OCommonAccessibleText::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { OUString sText( implGetText() ); @@ -301,7 +301,7 @@ namespace comphelper } - TextSegment OCommonAccessibleText::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException) + TextSegment OCommonAccessibleText::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { OUString sText( implGetText() ); sal_Int32 nLength = sText.getLength(); @@ -405,7 +405,7 @@ namespace comphelper } - TextSegment OCommonAccessibleText::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException) + TextSegment OCommonAccessibleText::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { OUString sText( implGetText() ); sal_Int32 nLength = sText.getLength(); @@ -529,7 +529,7 @@ namespace comphelper } - TextSegment OCommonAccessibleText::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException) + TextSegment OCommonAccessibleText::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { OUString sText( implGetText() ); sal_Int32 nLength = sText.getLength(); @@ -772,7 +772,7 @@ namespace comphelper // XAccessibleText - sal_Unicode OAccessibleTextHelper::getCharacter( sal_Int32 nIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + sal_Unicode OAccessibleTextHelper::getCharacter( sal_Int32 nIndex ) { OExternalLockGuard aGuard( this ); @@ -780,7 +780,7 @@ namespace comphelper } - sal_Int32 OAccessibleTextHelper::getCharacterCount() throw (RuntimeException, std::exception) + sal_Int32 OAccessibleTextHelper::getCharacterCount() { OExternalLockGuard aGuard( this ); @@ -788,7 +788,7 @@ namespace comphelper } - OUString OAccessibleTextHelper::getSelectedText() throw (RuntimeException, std::exception) + OUString OAccessibleTextHelper::getSelectedText() { OExternalLockGuard aGuard( this ); @@ -796,7 +796,7 @@ namespace comphelper } - sal_Int32 OAccessibleTextHelper::getSelectionStart() throw (RuntimeException, std::exception) + sal_Int32 OAccessibleTextHelper::getSelectionStart() { OExternalLockGuard aGuard( this ); @@ -804,7 +804,7 @@ namespace comphelper } - sal_Int32 OAccessibleTextHelper::getSelectionEnd() throw (RuntimeException, std::exception) + sal_Int32 OAccessibleTextHelper::getSelectionEnd() { OExternalLockGuard aGuard( this ); @@ -812,7 +812,7 @@ namespace comphelper } - OUString OAccessibleTextHelper::getText() throw (RuntimeException, std::exception) + OUString OAccessibleTextHelper::getText() { OExternalLockGuard aGuard( this ); @@ -820,7 +820,7 @@ namespace comphelper } - OUString OAccessibleTextHelper::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + OUString OAccessibleTextHelper::getTextRange( sal_Int32 nStartIndex, sal_Int32 nEndIndex ) { OExternalLockGuard aGuard( this ); @@ -828,7 +828,7 @@ namespace comphelper } - TextSegment OAccessibleTextHelper::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException, std::exception) + TextSegment OAccessibleTextHelper::getTextAtIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { OExternalLockGuard aGuard( this ); @@ -836,7 +836,7 @@ namespace comphelper } - TextSegment OAccessibleTextHelper::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException, std::exception) + TextSegment OAccessibleTextHelper::getTextBeforeIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { OExternalLockGuard aGuard( this ); @@ -844,7 +844,7 @@ namespace comphelper } - TextSegment OAccessibleTextHelper::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) throw (IndexOutOfBoundsException, IllegalArgumentException, RuntimeException, std::exception) + TextSegment OAccessibleTextHelper::getTextBehindIndex( sal_Int32 nIndex, sal_Int16 aTextType ) { OExternalLockGuard aGuard( this ); diff --git a/comphelper/source/misc/accessiblewrapper.cxx b/comphelper/source/misc/accessiblewrapper.cxx index 41fb4f540fed..a28fea7b7f11 100644 --- a/comphelper/source/misc/accessiblewrapper.cxx +++ b/comphelper/source/misc/accessiblewrapper.cxx @@ -235,7 +235,7 @@ namespace comphelper } - void SAL_CALL OWrappedAccessibleChildrenManager::disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception) + void SAL_CALL OWrappedAccessibleChildrenManager::disposing( const EventObject& _rSource ) { // this should come from one of the inner XAccessible's of our children Reference< XAccessible > xSource( _rSource.Source, UNO_QUERY ); @@ -295,7 +295,7 @@ namespace comphelper IMPLEMENT_FORWARD_REFCOUNT( OAccessibleWrapper, OComponentProxyAggregation ) - Any OAccessibleWrapper::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception) + Any OAccessibleWrapper::queryInterface( const Type& _rType ) { // #111089# instead of the inner XAccessible the proxy XAccessible must be returned Any aReturn = OAccessibleWrapper_Base::queryInterface( _rType ); @@ -318,7 +318,7 @@ namespace comphelper } - Reference< XAccessibleContext > SAL_CALL OAccessibleWrapper::getAccessibleContext( ) throw (RuntimeException, std::exception) + Reference< XAccessibleContext > SAL_CALL OAccessibleWrapper::getAccessibleContext( ) { // see if the context is still alive (we cache it) Reference< XAccessibleContext > xContext = m_aContext; @@ -383,7 +383,7 @@ namespace comphelper } - Any SAL_CALL OAccessibleContextWrapperHelper::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception) + Any SAL_CALL OAccessibleContextWrapperHelper::queryInterface( const Type& _rType ) { Any aReturn = OComponentProxyAggregationHelper::queryInterface( _rType ); if ( !aReturn.hasValue() ) @@ -395,13 +395,13 @@ namespace comphelper IMPLEMENT_FORWARD_XTYPEPROVIDER2( OAccessibleContextWrapperHelper, OComponentProxyAggregationHelper, OAccessibleContextWrapperHelper_Base ) - sal_Int32 OAccessibleContextWrapperHelper::baseGetAccessibleChildCount( ) throw (RuntimeException, std::exception) + sal_Int32 OAccessibleContextWrapperHelper::baseGetAccessibleChildCount( ) { return m_xInnerContext->getAccessibleChildCount(); } - Reference< XAccessible > OAccessibleContextWrapperHelper::baseGetAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + Reference< XAccessible > OAccessibleContextWrapperHelper::baseGetAccessibleChild( sal_Int32 i ) { // get the child of the wrapped component Reference< XAccessible > xInnerChild = m_xInnerContext->getAccessibleChild( i ); @@ -409,7 +409,7 @@ namespace comphelper } - Reference< XAccessibleRelationSet > OAccessibleContextWrapperHelper::baseGetAccessibleRelationSet( ) throw (RuntimeException, std::exception) + Reference< XAccessibleRelationSet > OAccessibleContextWrapperHelper::baseGetAccessibleRelationSet( ) { return m_xInnerContext->getAccessibleRelationSet(); // TODO: if this relation set would contain relations to siblings, we would normally need @@ -417,7 +417,7 @@ namespace comphelper } - void SAL_CALL OAccessibleContextWrapperHelper::notifyEvent( const AccessibleEventObject& _rEvent ) throw (RuntimeException, std::exception) + void SAL_CALL OAccessibleContextWrapperHelper::notifyEvent( const AccessibleEventObject& _rEvent ) { #if OSL_DEBUG_LEVEL > 0 if ( AccessibleEventId::STATE_CHANGED == _rEvent.EventId ) @@ -455,7 +455,7 @@ namespace comphelper } - void SAL_CALL OAccessibleContextWrapperHelper::dispose() throw( RuntimeException, std::exception ) + void SAL_CALL OAccessibleContextWrapperHelper::dispose() { ::osl::MutexGuard aGuard( m_rBHelper.rMutex ); @@ -473,7 +473,7 @@ namespace comphelper } - void SAL_CALL OAccessibleContextWrapperHelper::disposing( const EventObject& _rEvent ) throw (RuntimeException, std::exception) + void SAL_CALL OAccessibleContextWrapperHelper::disposing( const EventObject& _rEvent ) { // simply disambiguate this OComponentProxyAggregationHelper::disposing( _rEvent ); @@ -501,74 +501,74 @@ namespace comphelper } - sal_Int32 SAL_CALL OAccessibleContextWrapper::getAccessibleChildCount( ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL OAccessibleContextWrapper::getAccessibleChildCount( ) { return baseGetAccessibleChildCount(); } - Reference< XAccessible > SAL_CALL OAccessibleContextWrapper::getAccessibleChild( sal_Int32 i ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) + Reference< XAccessible > SAL_CALL OAccessibleContextWrapper::getAccessibleChild( sal_Int32 i ) { return baseGetAccessibleChild( i ); } - Reference< XAccessible > SAL_CALL OAccessibleContextWrapper::getAccessibleParent( ) throw (RuntimeException, std::exception) + Reference< XAccessible > SAL_CALL OAccessibleContextWrapper::getAccessibleParent( ) { return m_xParentAccessible; } - sal_Int32 SAL_CALL OAccessibleContextWrapper::getAccessibleIndexInParent( ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL OAccessibleContextWrapper::getAccessibleIndexInParent( ) { return m_xInnerContext->getAccessibleIndexInParent(); } - sal_Int16 SAL_CALL OAccessibleContextWrapper::getAccessibleRole( ) throw (RuntimeException, std::exception) + sal_Int16 SAL_CALL OAccessibleContextWrapper::getAccessibleRole( ) { return m_xInnerContext->getAccessibleRole(); } - OUString SAL_CALL OAccessibleContextWrapper::getAccessibleDescription( ) throw (RuntimeException, std::exception) + OUString SAL_CALL OAccessibleContextWrapper::getAccessibleDescription( ) { return m_xInnerContext->getAccessibleDescription(); } - OUString SAL_CALL OAccessibleContextWrapper::getAccessibleName( ) throw (RuntimeException, std::exception) + OUString SAL_CALL OAccessibleContextWrapper::getAccessibleName( ) { return m_xInnerContext->getAccessibleName(); } - Reference< XAccessibleRelationSet > SAL_CALL OAccessibleContextWrapper::getAccessibleRelationSet( ) throw (RuntimeException, std::exception) + Reference< XAccessibleRelationSet > SAL_CALL OAccessibleContextWrapper::getAccessibleRelationSet( ) { return baseGetAccessibleRelationSet(); } - Reference< XAccessibleStateSet > SAL_CALL OAccessibleContextWrapper::getAccessibleStateSet( ) throw (RuntimeException, std::exception) + Reference< XAccessibleStateSet > SAL_CALL OAccessibleContextWrapper::getAccessibleStateSet( ) { return m_xInnerContext->getAccessibleStateSet(); } - Locale SAL_CALL OAccessibleContextWrapper::getLocale( ) throw (IllegalAccessibleComponentStateException, RuntimeException, std::exception) + Locale SAL_CALL OAccessibleContextWrapper::getLocale( ) { return m_xInnerContext->getLocale(); } - void OAccessibleContextWrapper::notifyTranslatedEvent( const AccessibleEventObject& _rEvent ) throw (RuntimeException) + void OAccessibleContextWrapper::notifyTranslatedEvent( const AccessibleEventObject& _rEvent ) { if ( m_nNotifierClient ) AccessibleEventNotifier::addEvent( m_nNotifierClient, _rEvent ); } - void SAL_CALL OAccessibleContextWrapper::addAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) throw (RuntimeException, std::exception) + void SAL_CALL OAccessibleContextWrapper::addAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_nNotifierClient ) @@ -577,7 +577,7 @@ namespace comphelper } - void SAL_CALL OAccessibleContextWrapper::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) throw (RuntimeException, std::exception) + void SAL_CALL OAccessibleContextWrapper::removeAccessibleEventListener( const Reference< XAccessibleEventListener >& _rxListener ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_nNotifierClient ) @@ -592,7 +592,7 @@ namespace comphelper } - void SAL_CALL OAccessibleContextWrapper::disposing() throw (RuntimeException) + void SAL_CALL OAccessibleContextWrapper::disposing() { AccessibleEventNotifier::TClientId nClientId( 0 ); diff --git a/comphelper/source/misc/accimplaccess.cxx b/comphelper/source/misc/accimplaccess.cxx index 1c4096f38e08..1a546598d827 100644 --- a/comphelper/source/misc/accimplaccess.cxx +++ b/comphelper/source/misc/accimplaccess.cxx @@ -74,7 +74,7 @@ namespace comphelper } - sal_Int64 SAL_CALL OAccessibleImplementationAccess::getSomething( const Sequence< sal_Int8 >& _rIdentifier ) throw (RuntimeException, std::exception) + sal_Int64 SAL_CALL OAccessibleImplementationAccess::getSomething( const Sequence< sal_Int8 >& _rIdentifier ) { sal_Int64 nReturn( 0 ); diff --git a/comphelper/source/misc/configuration.cxx b/comphelper/source/misc/configuration.cxx index 5d14d6772591..6847f2f7cc00 100644 --- a/comphelper/source/misc/configuration.cxx +++ b/comphelper/source/misc/configuration.cxx @@ -238,14 +238,12 @@ void comphelper::ConfigurationListener::dispose() } void SAL_CALL comphelper::ConfigurationListener::disposing(css::lang::EventObject const &) - throw (css::uno::RuntimeException, std::exception) { dispose(); } void SAL_CALL comphelper::ConfigurationListener::propertyChange( css::beans::PropertyChangeEvent const &rEvt ) - throw (css::uno::RuntimeException, std::exception) { // Code is commonly used inside the SolarMutexGuard // so to avoid concurrent writes to the property, diff --git a/comphelper/source/misc/docpasswordrequest.cxx b/comphelper/source/misc/docpasswordrequest.cxx index 3ebcde4e82f7..105956c1692d 100644 --- a/comphelper/source/misc/docpasswordrequest.cxx +++ b/comphelper/source/misc/docpasswordrequest.cxx @@ -46,7 +46,7 @@ namespace comphelper { class AbortContinuation : public ::cppu::WeakImplHelper< XInteractionAbort > { public: - virtual void SAL_CALL select() throw( RuntimeException, std::exception ) override {} + virtual void SAL_CALL select() override {} }; @@ -57,16 +57,16 @@ public: inline bool isSelected() const { return mbSelected; } - virtual void SAL_CALL select() throw( RuntimeException, std::exception ) override { mbSelected = true; } + virtual void SAL_CALL select() override { mbSelected = true; } - virtual void SAL_CALL setPassword( const OUString& rPass ) throw( RuntimeException, std::exception ) override { maPassword = rPass; } - virtual OUString SAL_CALL getPassword() throw( RuntimeException, std::exception ) override { return maPassword; } + virtual void SAL_CALL setPassword( const OUString& rPass ) override { maPassword = rPass; } + virtual OUString SAL_CALL getPassword() override { return maPassword; } - virtual void SAL_CALL setPasswordToModify( const OUString& rPass ) throw( RuntimeException, std::exception ) override { maModifyPassword = rPass; } - virtual OUString SAL_CALL getPasswordToModify() throw( RuntimeException, std::exception ) override { return maModifyPassword; } + virtual void SAL_CALL setPasswordToModify( const OUString& rPass ) override { maModifyPassword = rPass; } + virtual OUString SAL_CALL getPasswordToModify() override { return maModifyPassword; } - virtual void SAL_CALL setRecommendReadOnly( sal_Bool bReadOnly ) throw( RuntimeException, std::exception ) override { mbReadOnly = bReadOnly; } - virtual sal_Bool SAL_CALL getRecommendReadOnly() throw( RuntimeException, std::exception ) override { return mbReadOnly; } + virtual void SAL_CALL setRecommendReadOnly( sal_Bool bReadOnly ) override { mbReadOnly = bReadOnly; } + virtual sal_Bool SAL_CALL getRecommendReadOnly() override { return mbReadOnly; } private: OUString maPassword; @@ -100,12 +100,12 @@ OUString SimplePasswordRequest::getPassword() const return mxPassword->getPassword(); } -Any SAL_CALL SimplePasswordRequest::getRequest() throw( RuntimeException, std::exception ) +Any SAL_CALL SimplePasswordRequest::getRequest() { return maRequest; } -Sequence< Reference< XInteractionContinuation > > SAL_CALL SimplePasswordRequest::getContinuations() throw( RuntimeException, std::exception ) +Sequence< Reference< XInteractionContinuation > > SAL_CALL SimplePasswordRequest::getContinuations() { return { mxAbort.get(), mxPassword.get() }; } @@ -162,12 +162,12 @@ bool DocPasswordRequest::getRecommendReadOnly() const return mxPassword->getRecommendReadOnly(); } -Any SAL_CALL DocPasswordRequest::getRequest() throw( RuntimeException, std::exception ) +Any SAL_CALL DocPasswordRequest::getRequest() { return maRequest; } -Sequence< Reference< XInteractionContinuation > > SAL_CALL DocPasswordRequest::getContinuations() throw( RuntimeException, std::exception ) +Sequence< Reference< XInteractionContinuation > > SAL_CALL DocPasswordRequest::getContinuations() { return { mxAbort.get(), mxPassword.get() }; } diff --git a/comphelper/source/misc/documentiologring.cxx b/comphelper/source/misc/documentiologring.cxx index 424f86c093df..e90cd95f0cf8 100644 --- a/comphelper/source/misc/documentiologring.cxx +++ b/comphelper/source/misc/documentiologring.cxx @@ -47,7 +47,7 @@ OSimpleLogRing::~OSimpleLogRing() // XSimpleLogRing -void SAL_CALL OSimpleLogRing::logString( const OUString& aMessage ) throw (uno::RuntimeException, std::exception) +void SAL_CALL OSimpleLogRing::logString( const OUString& aMessage ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -63,7 +63,7 @@ void SAL_CALL OSimpleLogRing::logString( const OUString& aMessage ) throw (uno:: } -uno::Sequence< OUString > SAL_CALL OSimpleLogRing::getCollectedLog() throw (uno::RuntimeException, std::exception) +uno::Sequence< OUString > SAL_CALL OSimpleLogRing::getCollectedLog() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -82,7 +82,7 @@ uno::Sequence< OUString > SAL_CALL OSimpleLogRing::getCollectedLog() throw (uno: // XInitialization -void SAL_CALL OSimpleLogRing::initialize( const uno::Sequence< uno::Any >& aArguments ) throw (uno::Exception, uno::RuntimeException, std::exception) +void SAL_CALL OSimpleLogRing::initialize( const uno::Sequence< uno::Any >& aArguments ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_bInitialized ) @@ -107,17 +107,17 @@ void SAL_CALL OSimpleLogRing::initialize( const uno::Sequence< uno::Any >& aArgu } // XServiceInfo -OUString SAL_CALL OSimpleLogRing::getImplementationName() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL OSimpleLogRing::getImplementationName() { return OUString("com.sun.star.comp.logging.SimpleLogRing"); } -sal_Bool SAL_CALL OSimpleLogRing::supportsService( const OUString& aServiceName ) throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL OSimpleLogRing::supportsService( const OUString& aServiceName ) { return cppu::supportsService(this, aServiceName); } -uno::Sequence< OUString > SAL_CALL OSimpleLogRing::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) +uno::Sequence< OUString > SAL_CALL OSimpleLogRing::getSupportedServiceNames() { return { "com.sun.star.logging.SimpleLogRing" }; } diff --git a/comphelper/source/misc/documentiologring.hxx b/comphelper/source/misc/documentiologring.hxx index 9a7c7a957094..b4cffa8b85cf 100644 --- a/comphelper/source/misc/documentiologring.hxx +++ b/comphelper/source/misc/documentiologring.hxx @@ -49,16 +49,16 @@ public: virtual ~OSimpleLogRing() override; // XSimpleLogRing - virtual void SAL_CALL logString( const OUString& aMessage ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getCollectedLog() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL logString( const OUString& aMessage ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getCollectedLog() override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; diff --git a/comphelper/source/misc/evtlistenerhlp.cxx b/comphelper/source/misc/evtlistenerhlp.cxx index 0307e4c48283..2eac315808f0 100644 --- a/comphelper/source/misc/evtlistenerhlp.cxx +++ b/comphelper/source/misc/evtlistenerhlp.cxx @@ -25,7 +25,7 @@ namespace comphelper _rxListener) : m_xListener(_rxListener) { } - void SAL_CALL OEventListenerHelper::disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) + void SAL_CALL OEventListenerHelper::disposing( const css::lang::EventObject& Source ) { css::uno::Reference< css::lang::XEventListener> xRef = m_xListener; if(xRef.is()) diff --git a/comphelper/source/misc/instancelocker.cxx b/comphelper/source/misc/instancelocker.cxx index e6a39e876c93..97671aca372c 100644 --- a/comphelper/source/misc/instancelocker.cxx +++ b/comphelper/source/misc/instancelocker.cxx @@ -67,7 +67,6 @@ OInstanceLocker::~OInstanceLocker() // XComponent void SAL_CALL OInstanceLocker::dispose() - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -89,7 +88,6 @@ void SAL_CALL OInstanceLocker::dispose() void SAL_CALL OInstanceLocker::addEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_bDisposed ) @@ -103,7 +101,6 @@ void SAL_CALL OInstanceLocker::addEventListener( const uno::Reference< lang::XEv void SAL_CALL OInstanceLocker::removeEventListener( const uno::Reference< lang::XEventListener >& xListener ) - throw (uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_pListenersContainer ) @@ -113,7 +110,6 @@ void SAL_CALL OInstanceLocker::removeEventListener( const uno::Reference< lang:: // XInitialization void SAL_CALL OInstanceLocker::initialize( const uno::Sequence< uno::Any >& aArguments ) - throw (uno::Exception, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_bInitialized ) @@ -181,19 +177,16 @@ void SAL_CALL OInstanceLocker::initialize( const uno::Sequence< uno::Any >& aArg // XServiceInfo OUString SAL_CALL OInstanceLocker::getImplementationName( ) - throw (uno::RuntimeException, std::exception) { return OUString( "com.sun.star.comp.embed.InstanceLocker" ); } sal_Bool SAL_CALL OInstanceLocker::supportsService( const OUString& ServiceName ) - throw (uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } uno::Sequence< OUString > SAL_CALL OInstanceLocker::getSupportedServiceNames() - throw (uno::RuntimeException, std::exception) { const OUString aServiceName( "com.sun.star.embed.InstanceLocker" ); return uno::Sequence< OUString >( &aServiceName, 1 ); @@ -262,7 +255,6 @@ void OLockListener::Dispose() // XEventListener void SAL_CALL OLockListener::disposing( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { ::osl::ResettableMutexGuard aGuard( m_aMutex ); @@ -287,7 +279,6 @@ void SAL_CALL OLockListener::disposing( const lang::EventObject& aEvent ) // XCloseListener void SAL_CALL OLockListener::queryClosing( const lang::EventObject& aEvent, sal_Bool ) - throw (util::CloseVetoException, uno::RuntimeException, std::exception) { // GetsOwnership parameter is always ignored, the user of the service must close the object always ::osl::ResettableMutexGuard aGuard( m_aMutex ); @@ -317,7 +308,6 @@ void SAL_CALL OLockListener::queryClosing( const lang::EventObject& aEvent, sal_ void SAL_CALL OLockListener::notifyClosing( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { ::osl::ResettableMutexGuard aGuard( m_aMutex ); @@ -348,7 +338,6 @@ void SAL_CALL OLockListener::notifyClosing( const lang::EventObject& aEvent ) // XTerminateListener void SAL_CALL OLockListener::queryTermination( const lang::EventObject& aEvent ) - throw (frame::TerminationVetoException, uno::RuntimeException, std::exception) { ::osl::ResettableMutexGuard aGuard( m_aMutex ); if ( aEvent.Source == m_xInstance && ( m_nMode & embed::Actions::PREVENT_TERMINATION ) ) @@ -377,7 +366,6 @@ void SAL_CALL OLockListener::queryTermination( const lang::EventObject& aEvent ) void SAL_CALL OLockListener::notifyTermination( const lang::EventObject& aEvent ) - throw (uno::RuntimeException, std::exception) { ::osl::ResettableMutexGuard aGuard( m_aMutex ); diff --git a/comphelper/source/misc/instancelocker.hxx b/comphelper/source/misc/instancelocker.hxx index df6c39cedd7a..cb6d229fc2dd 100644 --- a/comphelper/source/misc/instancelocker.hxx +++ b/comphelper/source/misc/instancelocker.hxx @@ -57,17 +57,17 @@ public: virtual ~OInstanceLocker() override; // XComponent - virtual void SAL_CALL dispose() throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; + virtual void SAL_CALL addEventListener( const css::uno::Reference< css::lang::XEventListener >& xListener ) override; + virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; @@ -98,15 +98,15 @@ public: void Dispose(); // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; // XCloseListener - virtual void SAL_CALL queryClosing( const css::lang::EventObject& Source, sal_Bool GetsOwnership ) throw (css::util::CloseVetoException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL notifyClosing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL queryClosing( const css::lang::EventObject& Source, sal_Bool GetsOwnership ) override; + virtual void SAL_CALL notifyClosing( const css::lang::EventObject& Source ) override; // XTerminateListener - virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) throw (css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) override; + virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) override; }; diff --git a/comphelper/source/misc/interaction.cxx b/comphelper/source/misc/interaction.cxx index 62f5bd2b84a5..8f07dafb638f 100644 --- a/comphelper/source/misc/interaction.cxx +++ b/comphelper/source/misc/interaction.cxx @@ -28,13 +28,13 @@ namespace comphelper using namespace ::com::sun::star::uno; using namespace ::com::sun::star::task; - void SAL_CALL OInteractionPassword::setPassword( const OUString& Password ) throw (RuntimeException, std::exception) + void SAL_CALL OInteractionPassword::setPassword( const OUString& Password ) { m_sPassword = Password; } - OUString SAL_CALL OInteractionPassword::getPassword( ) throw (RuntimeException, std::exception) + OUString SAL_CALL OInteractionPassword::getPassword( ) { return m_sPassword; } @@ -61,13 +61,13 @@ namespace comphelper } - Any SAL_CALL OInteractionRequest::getRequest( ) throw(RuntimeException, std::exception) + Any SAL_CALL OInteractionRequest::getRequest( ) { return m_aRequest; } - Sequence< Reference< XInteractionContinuation > > SAL_CALL OInteractionRequest::getContinuations( ) throw(RuntimeException, std::exception) + Sequence< Reference< XInteractionContinuation > > SAL_CALL OInteractionRequest::getContinuations( ) { return comphelper::containerToSequence(m_aContinuations); } diff --git a/comphelper/source/misc/numberedcollection.cxx b/comphelper/source/misc/numberedcollection.cxx index d0d86d751696..1faf639b16fb 100644 --- a/comphelper/source/misc/numberedcollection.cxx +++ b/comphelper/source/misc/numberedcollection.cxx @@ -63,8 +63,6 @@ void NumberedCollection::setUntitledPrefix(const OUString& sPrefix) ::sal_Int32 SAL_CALL NumberedCollection::leaseNumber(const css::uno::Reference< css::uno::XInterface >& xComponent) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception ) { // SYNCHRONIZED -> ::osl::ResettableMutexGuard aLock(m_aMutex); @@ -100,8 +98,6 @@ void NumberedCollection::setUntitledPrefix(const OUString& sPrefix) void SAL_CALL NumberedCollection::releaseNumber(::sal_Int32 nNumber) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception ) { // SYNCHRONIZED -> ::osl::ResettableMutexGuard aLock(m_aMutex); @@ -139,8 +135,6 @@ void SAL_CALL NumberedCollection::releaseNumber(::sal_Int32 nNumber) void SAL_CALL NumberedCollection::releaseNumberForComponent(const css::uno::Reference< css::uno::XInterface >& xComponent) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, std::exception ) { // SYNCHRONIZED -> ::osl::ResettableMutexGuard aLock(m_aMutex); @@ -163,7 +157,6 @@ void SAL_CALL NumberedCollection::releaseNumberForComponent(const css::uno::Refe OUString SAL_CALL NumberedCollection::getUntitledPrefix() - throw (css::uno::RuntimeException, std::exception) { // SYNCHRONIZED -> ::osl::ResettableMutexGuard aLock(m_aMutex); diff --git a/comphelper/source/misc/officerestartmanager.cxx b/comphelper/source/misc/officerestartmanager.cxx index a8895285a0fb..37b1d0d02882 100644 --- a/comphelper/source/misc/officerestartmanager.cxx +++ b/comphelper/source/misc/officerestartmanager.cxx @@ -35,7 +35,6 @@ namespace comphelper // XRestartManager void SAL_CALL OOfficeRestartManager::requestRestart( const uno::Reference< task::XInteractionHandler >& /* xInteractionHandler */ ) - throw (uno::Exception, uno::RuntimeException, std::exception) { if ( !m_xContext.is() ) throw uno::RuntimeException(); @@ -77,7 +76,6 @@ void SAL_CALL OOfficeRestartManager::requestRestart( const uno::Reference< task: sal_Bool SAL_CALL OOfficeRestartManager::isRestartRequested( sal_Bool bOfficeInitialized ) - throw (uno::Exception, uno::RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -90,7 +88,6 @@ sal_Bool SAL_CALL OOfficeRestartManager::isRestartRequested( sal_Bool bOfficeIni // XCallback void SAL_CALL OOfficeRestartManager::notify( const uno::Any& /* aData */ ) - throw ( uno::RuntimeException, std::exception ) { try { @@ -132,17 +129,17 @@ void SAL_CALL OOfficeRestartManager::notify( const uno::Any& /* aData */ ) // XServiceInfo -OUString SAL_CALL OOfficeRestartManager::getImplementationName() throw (uno::RuntimeException, std::exception) +OUString SAL_CALL OOfficeRestartManager::getImplementationName() { return OUString("com.sun.star.comp.task.OfficeRestartManager"); } -sal_Bool SAL_CALL OOfficeRestartManager::supportsService( const OUString& aServiceName ) throw (uno::RuntimeException, std::exception) +sal_Bool SAL_CALL OOfficeRestartManager::supportsService( const OUString& aServiceName ) { return cppu::supportsService(this, aServiceName); } -uno::Sequence< OUString > SAL_CALL OOfficeRestartManager::getSupportedServiceNames() throw (uno::RuntimeException, std::exception) +uno::Sequence< OUString > SAL_CALL OOfficeRestartManager::getSupportedServiceNames() { return { "com.sun.star.comp.task.OfficeRestartManager" }; } diff --git a/comphelper/source/misc/officerestartmanager.hxx b/comphelper/source/misc/officerestartmanager.hxx index 02a65efd5f61..cfada99c858a 100644 --- a/comphelper/source/misc/officerestartmanager.hxx +++ b/comphelper/source/misc/officerestartmanager.hxx @@ -49,16 +49,16 @@ public: {} // XRestartManager - virtual void SAL_CALL requestRestart( const css::uno::Reference< css::task::XInteractionHandler >& xInteractionHandler ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isRestartRequested( sal_Bool bInitialized ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL requestRestart( const css::uno::Reference< css::task::XInteractionHandler >& xInteractionHandler ) override; + virtual sal_Bool SAL_CALL isRestartRequested( sal_Bool bInitialized ) override; // XCallback - virtual void SAL_CALL notify( const css::uno::Any& aData ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL notify( const css::uno::Any& aData ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; diff --git a/comphelper/source/misc/proxyaggregation.cxx b/comphelper/source/misc/proxyaggregation.cxx index 1f2181f6c13c..764dc92d91f1 100644 --- a/comphelper/source/misc/proxyaggregation.cxx +++ b/comphelper/source/misc/proxyaggregation.cxx @@ -65,13 +65,13 @@ namespace comphelper } - Any SAL_CALL OProxyAggregation::queryAggregation( const Type& _rType ) throw (RuntimeException) + Any SAL_CALL OProxyAggregation::queryAggregation( const Type& _rType ) { return m_xProxyAggregate.is() ? m_xProxyAggregate->queryAggregation( _rType ) : Any(); } - Sequence< Type > SAL_CALL OProxyAggregation::getTypes( ) throw (RuntimeException) + Sequence< Type > SAL_CALL OProxyAggregation::getTypes( ) { Sequence< Type > aTypes; if ( m_xProxyAggregate.is() ) @@ -122,7 +122,7 @@ namespace comphelper } - Any SAL_CALL OComponentProxyAggregationHelper::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception) + Any SAL_CALL OComponentProxyAggregationHelper::queryInterface( const Type& _rType ) { Any aReturn( BASE::queryInterface( _rType ) ); if ( !aReturn.hasValue() ) @@ -149,7 +149,7 @@ namespace comphelper } - void SAL_CALL OComponentProxyAggregationHelper::disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception) + void SAL_CALL OComponentProxyAggregationHelper::disposing( const EventObject& _rSource ) { if ( _rSource.Source == m_xInner ) { // it's our inner context which is dying -> dispose ourself @@ -161,7 +161,7 @@ namespace comphelper } - void SAL_CALL OComponentProxyAggregationHelper::dispose() throw( RuntimeException, std::exception ) + void SAL_CALL OComponentProxyAggregationHelper::dispose() { ::osl::MutexGuard aGuard( m_rBHelper.rMutex ); @@ -204,7 +204,7 @@ namespace comphelper IMPLEMENT_GET_IMPLEMENTATION_ID( OComponentProxyAggregation ) - Sequence< Type > SAL_CALL OComponentProxyAggregation::getTypes( ) throw (RuntimeException, std::exception) + Sequence< Type > SAL_CALL OComponentProxyAggregation::getTypes( ) { Sequence< Type > aTypes( OComponentProxyAggregationHelper::getTypes() ); @@ -217,7 +217,7 @@ namespace comphelper } - void SAL_CALL OComponentProxyAggregation::disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception) + void SAL_CALL OComponentProxyAggregation::disposing( const EventObject& _rSource ) { // Simply disambiguate---this is necessary for MSVC to distinguish // "disposing(EventObject)" from "disposing()"; but it is also a good @@ -228,14 +228,14 @@ namespace comphelper } - void SAL_CALL OComponentProxyAggregation::disposing() throw (RuntimeException) + void SAL_CALL OComponentProxyAggregation::disposing() { // call the dispose-functionality of the base, which will dispose our aggregated component OComponentProxyAggregationHelper::dispose(); } - void SAL_CALL OComponentProxyAggregation::dispose() throw( RuntimeException, std::exception ) + void SAL_CALL OComponentProxyAggregation::dispose() { // simply disambiguate WeakComponentImplHelperBase::dispose(); diff --git a/comphelper/source/misc/servicedecl.cxx b/comphelper/source/misc/servicedecl.cxx index 906df93f12f9..6cdf7b41bf94 100644 --- a/comphelper/source/misc/servicedecl.cxx +++ b/comphelper/source/misc/servicedecl.cxx @@ -47,21 +47,16 @@ public: const Factory& operator=(const Factory&) = delete; // XServiceInfo: - virtual OUString SAL_CALL getImplementationName() - throw (uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( OUString const& name ) - throw (uno::RuntimeException, std::exception) override; - virtual uno::Sequence SAL_CALL getSupportedServiceNames() - throw (uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( OUString const& name ) override; + virtual uno::Sequence SAL_CALL getSupportedServiceNames() override; // XSingleComponentFactory: virtual uno::Reference SAL_CALL createInstanceWithContext( - uno::Reference const& xContext ) - throw (uno::Exception, std::exception) override; + uno::Reference const& xContext ) override; virtual uno::Reference SAL_CALL createInstanceWithArgumentsAndContext( uno::Sequence const& args, - uno::Reference const& xContext ) - throw (uno::Exception, std::exception) override; + uno::Reference const& xContext ) override; private: virtual ~Factory() override; @@ -75,19 +70,16 @@ ServiceDecl::Factory::~Factory() // XServiceInfo: OUString ServiceDecl::Factory::getImplementationName() - throw (uno::RuntimeException, std::exception) { return m_rServiceDecl.getImplementationName(); } sal_Bool ServiceDecl::Factory::supportsService( OUString const& name ) - throw (uno::RuntimeException, std::exception) { return m_rServiceDecl.supportsService(name); } uno::Sequence ServiceDecl::Factory::getSupportedServiceNames() - throw (uno::RuntimeException, std::exception) { return m_rServiceDecl.getSupportedServiceNames(); } @@ -95,7 +87,6 @@ uno::Sequence ServiceDecl::Factory::getSupportedServiceNames() // XSingleComponentFactory: uno::Reference ServiceDecl::Factory::createInstanceWithContext( uno::Reference const& xContext ) - throw (uno::Exception, std::exception) { return m_rServiceDecl.m_createFunc( m_rServiceDecl, uno::Sequence(), xContext ); @@ -105,7 +96,6 @@ uno::Reference ServiceDecl::Factory::createInstanceWithArgumentsAndContext( uno::Sequence const& args, uno::Reference const& xContext ) - throw (uno::Exception, std::exception) { return m_rServiceDecl.m_createFunc( m_rServiceDecl, args, xContext ); diff --git a/comphelper/source/misc/serviceinfohelper.cxx b/comphelper/source/misc/serviceinfohelper.cxx index 838f4fec11eb..87f4c343c3f9 100644 --- a/comphelper/source/misc/serviceinfohelper.cxx +++ b/comphelper/source/misc/serviceinfohelper.cxx @@ -26,13 +26,13 @@ namespace comphelper { /** returns an empty UString(). most times sufficient */ -OUString SAL_CALL ServiceInfoHelper::getImplementationName() throw( css::uno::RuntimeException, std::exception ) +OUString SAL_CALL ServiceInfoHelper::getImplementationName() { return OUString(); } /** the base implementation has no supported services */ -css::uno::Sequence< OUString > ServiceInfoHelper::getSupportedServiceNames() throw( css::uno::RuntimeException, std::exception ) +css::uno::Sequence< OUString > ServiceInfoHelper::getSupportedServiceNames() { css::uno::Sequence< OUString> aSeq(0); return aSeq; diff --git a/comphelper/source/misc/storagehelper.cxx b/comphelper/source/misc/storagehelper.cxx index 394a0aab578f..b5fea9884aa4 100644 --- a/comphelper/source/misc/storagehelper.cxx +++ b/comphelper/source/misc/storagehelper.cxx @@ -53,7 +53,6 @@ namespace comphelper { uno::Reference< lang::XSingleServiceFactory > OStorageHelper::GetStorageFactory( const uno::Reference< uno::XComponentContext >& rxContext ) - throw ( uno::Exception ) { uno::Reference< uno::XComponentContext> xContext = rxContext.is() ? rxContext : ::comphelper::getProcessComponentContext(); @@ -63,7 +62,6 @@ uno::Reference< lang::XSingleServiceFactory > OStorageHelper::GetStorageFactory( uno::Reference< lang::XSingleServiceFactory > OStorageHelper::GetFileSystemStorageFactory( const uno::Reference< uno::XComponentContext >& rxContext ) - throw ( uno::Exception ) { uno::Reference< uno::XComponentContext> xContext = rxContext.is() ? rxContext : ::comphelper::getProcessComponentContext(); @@ -73,7 +71,6 @@ uno::Reference< lang::XSingleServiceFactory > OStorageHelper::GetFileSystemStora uno::Reference< embed::XStorage > OStorageHelper::GetTemporaryStorage( const uno::Reference< uno::XComponentContext >& rxContext ) - throw ( uno::Exception ) { uno::Reference< embed::XStorage > xTempStorage( GetStorageFactory( rxContext )->createInstance(), uno::UNO_QUERY ); @@ -88,7 +85,6 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageFromURL( const OUString& aURL, sal_Int32 nStorageMode, const uno::Reference< uno::XComponentContext >& rxContext ) - throw ( uno::Exception ) { uno::Sequence< uno::Any > aArgs( 2 ); aArgs[0] <<= aURL; @@ -107,7 +103,6 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageFromURL2( const OUString& aURL, sal_Int32 nStorageMode, const uno::Reference< uno::XComponentContext >& rxContext ) - throw ( uno::Exception ) { uno::Sequence< uno::Any > aArgs( 2 ); aArgs[0] <<= aURL; @@ -139,7 +134,6 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageFromURL2( uno::Reference< embed::XStorage > OStorageHelper::GetStorageFromInputStream( const uno::Reference < io::XInputStream >& xStream, const uno::Reference< uno::XComponentContext >& rxContext ) - throw ( uno::Exception ) { uno::Sequence< uno::Any > aArgs( 2 ); aArgs[0] <<= xStream; @@ -158,7 +152,6 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageFromStream( const uno::Reference < io::XStream >& xStream, sal_Int32 nStorageMode, const uno::Reference< uno::XComponentContext >& rxContext ) - throw ( uno::Exception ) { uno::Sequence< uno::Any > aArgs( 2 ); aArgs[0] <<= xStream; @@ -176,7 +169,6 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageFromStream( void OStorageHelper::CopyInputToOutput( const uno::Reference< io::XInputStream >& xInput, const uno::Reference< io::XOutputStream >& xOutput ) - throw ( uno::Exception ) { static const sal_Int32 nConstBufferSize = 32000; @@ -201,7 +193,6 @@ void OStorageHelper::CopyInputToOutput( uno::Reference< io::XInputStream > OStorageHelper::GetInputStreamFromURL( const OUString& aURL, const uno::Reference< uno::XComponentContext >& context ) - throw ( uno::Exception ) { uno::Reference< io::XInputStream > xInputStream = ucb::SimpleFileAccess::create(context)->openFileRead( aURL ); if ( !xInputStream.is() ) @@ -214,7 +205,6 @@ uno::Reference< io::XInputStream > OStorageHelper::GetInputStreamFromURL( void OStorageHelper::SetCommonStorageEncryptionData( const uno::Reference< embed::XStorage >& xStorage, const uno::Sequence< beans::NamedValue >& aEncryptionData ) - throw ( uno::Exception ) { uno::Reference< embed::XEncryptionProtectedSource2 > xEncrSet( xStorage, uno::UNO_QUERY ); if ( !xEncrSet.is() ) @@ -226,7 +216,6 @@ void OStorageHelper::SetCommonStorageEncryptionData( sal_Int32 OStorageHelper::GetXStorageFormat( const uno::Reference< embed::XStorage >& xStorage ) - throw ( uno::Exception, std::exception ) { uno::Reference< beans::XPropertySet > xStorProps( xStorage, uno::UNO_QUERY_THROW ); @@ -293,7 +282,6 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromURL( const OUString& aURL, sal_Int32 nStorageMode, const uno::Reference< uno::XComponentContext >& rxContext ) - throw ( uno::Exception ) { uno::Sequence< beans::PropertyValue > aProps( 1 ); aProps[0].Name = "StorageFormat"; @@ -318,7 +306,6 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromInputStr const uno::Reference < io::XInputStream >& xStream, const uno::Reference< uno::XComponentContext >& rxContext, bool bRepairStorage, bool bUseBufferedStream ) - throw ( uno::Exception ) { uno::Sequence< beans::PropertyValue > aProps( 1 ); sal_Int32 nPos = 0; @@ -361,7 +348,6 @@ uno::Reference< embed::XStorage > OStorageHelper::GetStorageOfFormatFromStream( sal_Int32 nStorageMode, const uno::Reference< uno::XComponentContext >& rxContext, bool bRepairStorage, bool bUseBufferedStream ) - throw ( uno::Exception ) { uno::Sequence< beans::PropertyValue > aProps( 1 ); sal_Int32 nPos = 0; diff --git a/comphelper/source/misc/types.cxx b/comphelper/source/misc/types.cxx index e8ccfedbac18..4f92aa15c319 100644 --- a/comphelper/source/misc/types.cxx +++ b/comphelper/source/misc/types.cxx @@ -100,7 +100,7 @@ bool getBOOL(const Any& _rAny) } -sal_Int32 getEnumAsINT32(const Any& _rAny) throw(IllegalArgumentException) +sal_Int32 getEnumAsINT32(const Any& _rAny) { sal_Int32 nReturn = 0; if (! ::cppu::enum2int(nReturn,_rAny) ) diff --git a/comphelper/source/misc/weak.cxx b/comphelper/source/misc/weak.cxx index 9db7ba1a5fc3..1aadadaa6b7f 100644 --- a/comphelper/source/misc/weak.cxx +++ b/comphelper/source/misc/weak.cxx @@ -34,7 +34,7 @@ OWeakTypeObject::~OWeakTypeObject() { } -Any SAL_CALL OWeakTypeObject::queryInterface(const Type & rType ) throw (RuntimeException, std::exception) +Any SAL_CALL OWeakTypeObject::queryInterface(const Type & rType ) { if( rType == cppu::UnoType::get() ) return Any( Reference< XTypeProvider >(this) ); @@ -52,12 +52,12 @@ void SAL_CALL OWeakTypeObject::release() throw () ::cppu::OWeakObject::release(); } -Sequence< Type > SAL_CALL OWeakTypeObject::getTypes( ) throw (RuntimeException, std::exception) +Sequence< Type > SAL_CALL OWeakTypeObject::getTypes( ) { return Sequence< Type >(); } -Sequence< ::sal_Int8 > SAL_CALL OWeakTypeObject::getImplementationId( ) throw (RuntimeException, std::exception) +Sequence< ::sal_Int8 > SAL_CALL OWeakTypeObject::getImplementationId( ) { return Sequence< ::sal_Int8 >(); } diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx index 6342182b8c6b..6d6e1de7cf19 100644 --- a/comphelper/source/officeinstdir/officeinstallationdirectories.cxx +++ b/comphelper/source/officeinstdir/officeinstallationdirectories.cxx @@ -100,7 +100,6 @@ OfficeInstallationDirectories::~OfficeInstallationDirectories() // virtual OUString SAL_CALL OfficeInstallationDirectories::getOfficeInstallationDirectoryURL() - throw ( uno::RuntimeException, std::exception ) { initDirs(); return OUString( *m_pOfficeBrandDir ); @@ -110,7 +109,6 @@ OfficeInstallationDirectories::getOfficeInstallationDirectoryURL() // virtual OUString SAL_CALL OfficeInstallationDirectories::getOfficeUserDataDirectoryURL() - throw ( uno::RuntimeException, std::exception ) { initDirs(); return OUString( *m_pUserDir ); @@ -121,7 +119,6 @@ OfficeInstallationDirectories::getOfficeUserDataDirectoryURL() // virtual OUString SAL_CALL OfficeInstallationDirectories::makeRelocatableURL( const OUString& URL ) - throw ( uno::RuntimeException, std::exception ) { if ( !URL.isEmpty() ) { @@ -157,7 +154,6 @@ OfficeInstallationDirectories::makeRelocatableURL( const OUString& URL ) // virtual OUString SAL_CALL OfficeInstallationDirectories::makeAbsoluteURL( const OUString& URL ) - throw ( uno::RuntimeException, std::exception ) { if ( !URL.isEmpty() ) { @@ -195,7 +191,6 @@ OfficeInstallationDirectories::makeAbsoluteURL( const OUString& URL ) // virtual OUString SAL_CALL OfficeInstallationDirectories::getImplementationName() - throw ( uno::RuntimeException, std::exception ) { return OUString("com.sun.star.comp.util.OfficeInstallationDirectories"); } @@ -203,7 +198,6 @@ OfficeInstallationDirectories::getImplementationName() // virtual sal_Bool SAL_CALL OfficeInstallationDirectories::supportsService( const OUString& ServiceName ) - throw ( uno::RuntimeException, std::exception ) { return cppu::supportsService(this, ServiceName); } @@ -211,7 +205,6 @@ OfficeInstallationDirectories::supportsService( const OUString& ServiceName ) // virtual uno::Sequence< OUString > SAL_CALL OfficeInstallationDirectories::getSupportedServiceNames() - throw ( uno::RuntimeException, std::exception ) { return { "com.sun.star.util.OfficeInstallationDirectories" }; } diff --git a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx index 20fcc6b6ca92..b1b235622a73 100644 --- a/comphelper/source/officeinstdir/officeinstallationdirectories.hxx +++ b/comphelper/source/officeinstdir/officeinstallationdirectories.hxx @@ -49,28 +49,21 @@ public: // XOfficeInstallationDirectories virtual OUString SAL_CALL - getOfficeInstallationDirectoryURL() - throw (css::uno::RuntimeException, std::exception) override; + getOfficeInstallationDirectoryURL() override; virtual OUString SAL_CALL - getOfficeUserDataDirectoryURL() - throw (css::uno::RuntimeException, std::exception) override; + getOfficeUserDataDirectoryURL() override; virtual OUString SAL_CALL - makeRelocatableURL( const OUString& URL ) - throw (css::uno::RuntimeException, std::exception) override; + makeRelocatableURL( const OUString& URL ) override; virtual OUString SAL_CALL - makeAbsoluteURL( const OUString& URL ) - throw (css::uno::RuntimeException, std::exception) override; + makeAbsoluteURL( const OUString& URL ) override; // XServiceInfo virtual OUString SAL_CALL - getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + getImplementationName() override; virtual sal_Bool SAL_CALL - supportsService( const OUString& ServiceName ) - throw (css::uno::RuntimeException, std::exception) override; + supportsService( const OUString& ServiceName ) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; private: void initDirs(); diff --git a/comphelper/source/property/ChainablePropertySet.cxx b/comphelper/source/property/ChainablePropertySet.cxx index 1f7d8d92c992..846fa7acb87b 100644 --- a/comphelper/source/property/ChainablePropertySet.cxx +++ b/comphelper/source/property/ChainablePropertySet.cxx @@ -45,13 +45,11 @@ ChainablePropertySet::~ChainablePropertySet() // XPropertySet Reference< XPropertySetInfo > SAL_CALL ChainablePropertySet::getPropertySetInfo( ) - throw(RuntimeException, std::exception) { return mxInfo.get(); } void SAL_CALL ChainablePropertySet::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) - throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). std::unique_ptr< osl::Guard< comphelper::SolarMutex > > xMutexGuard; @@ -69,7 +67,6 @@ void SAL_CALL ChainablePropertySet::setPropertyValue( const OUString& rPropertyN } Any SAL_CALL ChainablePropertySet::getPropertyValue( const OUString& rPropertyName ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). std::unique_ptr< osl::Guard< comphelper::SolarMutex > > xMutexGuard; @@ -90,33 +87,27 @@ Any SAL_CALL ChainablePropertySet::getPropertyValue( const OUString& rPropertyNa } void SAL_CALL ChainablePropertySet::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // todo } void SAL_CALL ChainablePropertySet::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // todo } void SAL_CALL ChainablePropertySet::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // todo } void SAL_CALL ChainablePropertySet::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // todo } // XMultiPropertySet void SAL_CALL ChainablePropertySet::setPropertyValues(const Sequence< OUString >& rPropertyNames, const Sequence< Any >& rValues) - throw (PropertyVetoException, IllegalArgumentException, - WrappedTargetException, RuntimeException, std::exception) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). std::unique_ptr< osl::Guard< comphelper::SolarMutex > > xMutexGuard; @@ -150,7 +141,6 @@ void SAL_CALL ChainablePropertySet::setPropertyValues(const Sequence< OUString > } Sequence< Any > SAL_CALL ChainablePropertySet::getPropertyValues(const Sequence< OUString >& rPropertyNames) - throw (RuntimeException, std::exception) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). std::unique_ptr< osl::Guard< comphelper::SolarMutex > > xMutexGuard; @@ -184,26 +174,22 @@ Sequence< Any > SAL_CALL ChainablePropertySet::getPropertyValues(const Sequence< } void SAL_CALL ChainablePropertySet::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) - throw(RuntimeException, std::exception) { // todo } void SAL_CALL ChainablePropertySet::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& ) - throw(RuntimeException, std::exception) { // todo } void SAL_CALL ChainablePropertySet::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) - throw(RuntimeException, std::exception) { // todo } // XPropertyState PropertyState SAL_CALL ChainablePropertySet::getPropertyState( const OUString& PropertyName ) - throw(UnknownPropertyException, RuntimeException, std::exception) { PropertyInfoHash::const_iterator aIter = mxInfo->maMap.find( PropertyName ); if( aIter == mxInfo->maMap.end()) @@ -219,7 +205,6 @@ PropertyState SAL_CALL ChainablePropertySet::getPropertyState( const OUString& P } Sequence< PropertyState > SAL_CALL ChainablePropertySet::getPropertyStates( const Sequence< OUString >& rPropertyNames ) - throw(UnknownPropertyException, RuntimeException, std::exception) { const sal_Int32 nCount = rPropertyNames.getLength(); @@ -245,7 +230,6 @@ Sequence< PropertyState > SAL_CALL ChainablePropertySet::getPropertyStates( cons } void SAL_CALL ChainablePropertySet::setPropertyToDefault( const OUString& rPropertyName ) - throw(UnknownPropertyException, RuntimeException, std::exception) { PropertyInfoHash::const_iterator aIter = mxInfo->maMap.find ( rPropertyName ); @@ -255,7 +239,6 @@ void SAL_CALL ChainablePropertySet::setPropertyToDefault( const OUString& rPrope } Any SAL_CALL ChainablePropertySet::getPropertyDefault( const OUString& rPropertyName ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { PropertyInfoHash::const_iterator aIter = mxInfo->maMap.find ( rPropertyName ); @@ -265,31 +248,26 @@ Any SAL_CALL ChainablePropertySet::getPropertyDefault( const OUString& rProperty } void ChainablePropertySet::_preGetPropertyState () - throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) { OSL_FAIL( "you have to implement this yourself!"); } void ChainablePropertySet::_getPropertyState( const comphelper::PropertyInfo&, PropertyState& ) - throw(UnknownPropertyException ) { OSL_FAIL( "you have to implement this yourself!"); } void ChainablePropertySet::_postGetPropertyState () - throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) { OSL_FAIL( "you have to implement this yourself!"); } void ChainablePropertySet::_setPropertyToDefault( const comphelper::PropertyInfo& ) - throw(UnknownPropertyException ) { OSL_FAIL( "you have to implement this yourself!"); } Any ChainablePropertySet::_getPropertyDefault( const comphelper::PropertyInfo& ) - throw(UnknownPropertyException, WrappedTargetException ) { OSL_FAIL( "you have to implement this yourself!"); diff --git a/comphelper/source/property/ChainablePropertySetInfo.cxx b/comphelper/source/property/ChainablePropertySetInfo.cxx index 4a2c34789810..00f6720324b0 100644 --- a/comphelper/source/property/ChainablePropertySetInfo.cxx +++ b/comphelper/source/property/ChainablePropertySetInfo.cxx @@ -52,7 +52,6 @@ void ChainablePropertySetInfo::remove( const OUString& aName ) } Sequence< ::Property > SAL_CALL ChainablePropertySetInfo::getProperties() - throw(css::uno::RuntimeException, std::exception) { sal_Int32 nSize = maMap.size(); if( maProperties.getLength() != nSize ) @@ -74,7 +73,6 @@ Sequence< ::Property > SAL_CALL ChainablePropertySetInfo::getProperties() } Property SAL_CALL ChainablePropertySetInfo::getPropertyByName( const OUString& rName ) - throw(::UnknownPropertyException, css::uno::RuntimeException, std::exception) { PropertyInfoHash::iterator aIter = maMap.find( rName ); @@ -91,7 +89,6 @@ Property SAL_CALL ChainablePropertySetInfo::getPropertyByName( const OUString& r } sal_Bool SAL_CALL ChainablePropertySetInfo::hasPropertyByName( const OUString& rName ) - throw(css::uno::RuntimeException, std::exception) { return maMap.find ( rName ) != maMap.end(); } diff --git a/comphelper/source/property/MasterPropertySet.cxx b/comphelper/source/property/MasterPropertySet.cxx index c6f1477480de..f3f3374851b1 100644 --- a/comphelper/source/property/MasterPropertySet.cxx +++ b/comphelper/source/property/MasterPropertySet.cxx @@ -75,7 +75,6 @@ MasterPropertySet::~MasterPropertySet() // XPropertySet Reference< XPropertySetInfo > SAL_CALL MasterPropertySet::getPropertySetInfo( ) - throw(RuntimeException, std::exception) { return mxInfo.get(); } @@ -88,7 +87,6 @@ void MasterPropertySet::registerSlave ( ChainablePropertySet *pNewSet ) } void SAL_CALL MasterPropertySet::setPropertyValue( const OUString& rPropertyName, const Any& rValue ) - throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). std::unique_ptr< osl::Guard< comphelper::SolarMutex > > xMutexGuard; @@ -122,7 +120,6 @@ void SAL_CALL MasterPropertySet::setPropertyValue( const OUString& rPropertyName } Any SAL_CALL MasterPropertySet::getPropertyValue( const OUString& rPropertyName ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). std::unique_ptr< osl::Guard< comphelper::SolarMutex > > xMutexGuard; @@ -158,32 +155,27 @@ Any SAL_CALL MasterPropertySet::getPropertyValue( const OUString& rPropertyName } void SAL_CALL MasterPropertySet::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // todo } void SAL_CALL MasterPropertySet::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // todo } void SAL_CALL MasterPropertySet::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // todo } void SAL_CALL MasterPropertySet::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { // todo } // XMultiPropertySet void SAL_CALL MasterPropertySet::setPropertyValues( const Sequence< OUString >& aPropertyNames, const Sequence< Any >& aValues ) - throw(PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). std::unique_ptr< osl::Guard< comphelper::SolarMutex > > xMutexGuard; @@ -247,7 +239,6 @@ void SAL_CALL MasterPropertySet::setPropertyValues( const Sequence< OUString >& } Sequence< Any > SAL_CALL MasterPropertySet::getPropertyValues( const Sequence< OUString >& aPropertyNames ) - throw(RuntimeException, std::exception) { // acquire mutex in c-tor and releases it in the d-tor (exception safe!). std::unique_ptr< osl::Guard< comphelper::SolarMutex > > xMutexGuard; @@ -311,26 +302,22 @@ Sequence< Any > SAL_CALL MasterPropertySet::getPropertyValues( const Sequence< O } void SAL_CALL MasterPropertySet::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) - throw(RuntimeException, std::exception) { // todo } void SAL_CALL MasterPropertySet::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& ) - throw(RuntimeException, std::exception) { // todo } void SAL_CALL MasterPropertySet::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) - throw(RuntimeException, std::exception) { // todo } // XPropertyState PropertyState SAL_CALL MasterPropertySet::getPropertyState( const OUString& PropertyName ) - throw(UnknownPropertyException, RuntimeException, std::exception) { PropertyDataHash::const_iterator aIter = mxInfo->maMap.find( PropertyName ); if( aIter == mxInfo->maMap.end()) @@ -366,7 +353,6 @@ PropertyState SAL_CALL MasterPropertySet::getPropertyState( const OUString& Prop } Sequence< PropertyState > SAL_CALL MasterPropertySet::getPropertyStates( const Sequence< OUString >& rPropertyNames ) - throw(UnknownPropertyException, RuntimeException, std::exception) { const sal_Int32 nCount = rPropertyNames.getLength(); @@ -411,7 +397,6 @@ Sequence< PropertyState > SAL_CALL MasterPropertySet::getPropertyStates( const S } void SAL_CALL MasterPropertySet::setPropertyToDefault( const OUString& rPropertyName ) - throw(UnknownPropertyException, RuntimeException, std::exception) { PropertyDataHash::const_iterator aIter = mxInfo->maMap.find ( rPropertyName ); @@ -421,7 +406,6 @@ void SAL_CALL MasterPropertySet::setPropertyToDefault( const OUString& rProperty } Any SAL_CALL MasterPropertySet::getPropertyDefault( const OUString& rPropertyName ) - throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) { PropertyDataHash::const_iterator aIter = mxInfo->maMap.find ( rPropertyName ); @@ -431,31 +415,26 @@ Any SAL_CALL MasterPropertySet::getPropertyDefault( const OUString& rPropertyNam } void MasterPropertySet::_preGetPropertyState () - throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) { OSL_FAIL( "you have to implement this yourself!"); } void MasterPropertySet::_getPropertyState( const comphelper::PropertyInfo&, PropertyState& ) - throw(UnknownPropertyException ) { OSL_FAIL( "you have to implement this yourself!"); } void MasterPropertySet::_postGetPropertyState () - throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException ) { OSL_FAIL( "you have to implement this yourself!"); } void MasterPropertySet::_setPropertyToDefault( const comphelper::PropertyInfo& ) - throw(UnknownPropertyException ) { OSL_FAIL( "you have to implement this yourself!"); } Any MasterPropertySet::_getPropertyDefault( const comphelper::PropertyInfo& ) - throw(UnknownPropertyException, WrappedTargetException ) { OSL_FAIL( "you have to implement this yourself!"); Any aAny; diff --git a/comphelper/source/property/MasterPropertySetInfo.cxx b/comphelper/source/property/MasterPropertySetInfo.cxx index 1db09060c317..35a9a5faee1d 100644 --- a/comphelper/source/property/MasterPropertySetInfo.cxx +++ b/comphelper/source/property/MasterPropertySetInfo.cxx @@ -61,7 +61,6 @@ void MasterPropertySetInfo::add( PropertyInfoHash &rHash, sal_uInt8 nMapId ) } Sequence< ::Property > SAL_CALL MasterPropertySetInfo::getProperties() - throw(css::uno::RuntimeException, std::exception) { sal_Int32 nSize = maMap.size(); if( maProperties.getLength() != nSize ) @@ -83,7 +82,6 @@ Sequence< ::Property > SAL_CALL MasterPropertySetInfo::getProperties() } Property SAL_CALL MasterPropertySetInfo::getPropertyByName( const OUString& rName ) - throw(::UnknownPropertyException, css::uno::RuntimeException, std::exception) { PropertyDataHash::iterator aIter = maMap.find( rName ); @@ -101,7 +99,6 @@ Property SAL_CALL MasterPropertySetInfo::getPropertyByName( const OUString& rNam } sal_Bool SAL_CALL MasterPropertySetInfo::hasPropertyByName( const OUString& rName ) - throw(css::uno::RuntimeException, std::exception) { return maMap.find ( rName ) != maMap.end(); } diff --git a/comphelper/source/property/genericpropertyset.cxx b/comphelper/source/property/genericpropertyset.cxx index 6ee1da2bbd55..93ce85d3779a 100644 --- a/comphelper/source/property/genericpropertyset.cxx +++ b/comphelper/source/property/genericpropertyset.cxx @@ -58,30 +58,30 @@ namespace comphelper cppu::OMultiTypeInterfaceContainerHelperVar m_aListener; protected: - virtual void _setPropertyValues( const PropertyMapEntry** ppEntries, const Any* pValues ) throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException ) override; - virtual void _getPropertyValues( const PropertyMapEntry** ppEntries, Any* pValue ) throw( UnknownPropertyException, WrappedTargetException ) override; + virtual void _setPropertyValues( const PropertyMapEntry** ppEntries, const Any* pValues ) override; + virtual void _getPropertyValues( const PropertyMapEntry** ppEntries, Any* pValue ) override; public: explicit GenericPropertySet( PropertySetInfo* pInfo ) throw(); // XInterface - virtual Any SAL_CALL queryAggregation( const Type & rType ) throw( RuntimeException, std::exception) override; - virtual Any SAL_CALL queryInterface( const Type & rType ) throw( RuntimeException, std::exception) override; + virtual Any SAL_CALL queryAggregation( const Type & rType ) override; + virtual Any SAL_CALL queryInterface( const Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual Sequence< Type > SAL_CALL getTypes( ) throw( RuntimeException, std::exception) override; - virtual Sequence< sal_Int8 > SAL_CALL getImplementationId( ) throw( RuntimeException, std::exception) override; + virtual Sequence< Type > SAL_CALL getTypes( ) override; + virtual Sequence< sal_Int8 > SAL_CALL getImplementationId( ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw( RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw( RuntimeException, std::exception ) override; - virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() throw( RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // XPropertySet - virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addPropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) override; + virtual void SAL_CALL removePropertyChangeListener( const OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) override; }; } @@ -93,7 +93,7 @@ GenericPropertySet::GenericPropertySet( PropertySetInfo* pInfo ) throw() { } -void SAL_CALL GenericPropertySet::addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL GenericPropertySet::addPropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) { Reference < XPropertySetInfo > xInfo = getPropertySetInfo( ); if ( xInfo.is() ) @@ -115,7 +115,7 @@ void SAL_CALL GenericPropertySet::addPropertyChangeListener( const OUString& aPr } } -void SAL_CALL GenericPropertySet::removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL GenericPropertySet::removePropertyChangeListener( const OUString& aPropertyName, const Reference< XPropertyChangeListener >& xListener ) { ResettableMutexGuard aGuard( maMutex ); Reference < XPropertySetInfo > xInfo = getPropertySetInfo( ); @@ -140,7 +140,6 @@ void SAL_CALL GenericPropertySet::removePropertyChangeListener( const OUString& } void GenericPropertySet::_setPropertyValues( const PropertyMapEntry** ppEntries, const Any* pValues ) - throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException ) { ResettableMutexGuard aGuard( maMutex ); @@ -166,7 +165,6 @@ void GenericPropertySet::_setPropertyValues( const PropertyMapEntry** ppEntries, } void GenericPropertySet::_getPropertyValues( const comphelper::PropertyMapEntry** ppEntries, Any* pValue ) - throw( UnknownPropertyException, WrappedTargetException ) { MutexGuard aGuard( maMutex ); @@ -182,13 +180,11 @@ void GenericPropertySet::_getPropertyValues( const comphelper::PropertyMapEntry* // XInterface Any SAL_CALL GenericPropertySet::queryInterface( const Type & rType ) - throw( RuntimeException, std::exception ) { return OWeakAggObject::queryInterface( rType ); } Any SAL_CALL GenericPropertySet::queryAggregation( const Type & rType ) - throw(RuntimeException, std::exception) { Any aAny; @@ -217,7 +213,6 @@ void SAL_CALL GenericPropertySet::release() throw() } uno::Sequence< uno::Type > SAL_CALL GenericPropertySet::getTypes() - throw (uno::RuntimeException, std::exception) { uno::Sequence< uno::Type > aTypes( 5 ); uno::Type* pTypes = aTypes.getArray(); @@ -232,24 +227,22 @@ uno::Sequence< uno::Type > SAL_CALL GenericPropertySet::getTypes() } uno::Sequence< sal_Int8 > SAL_CALL GenericPropertySet::getImplementationId() - throw (uno::RuntimeException, std::exception) { return css::uno::Sequence(); } // XServiceInfo -sal_Bool SAL_CALL GenericPropertySet::supportsService( const OUString& ServiceName ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL GenericPropertySet::supportsService( const OUString& ServiceName ) { return cppu::supportsService(this, ServiceName); } -OUString SAL_CALL GenericPropertySet::getImplementationName() throw( RuntimeException, std::exception ) +OUString SAL_CALL GenericPropertySet::getImplementationName() { return OUString( "com.sun.star.comp.comphelper.GenericPropertySet" ); } Sequence< OUString > SAL_CALL GenericPropertySet::getSupportedServiceNames( ) - throw( RuntimeException, std::exception ) { Sequence aSNS { "com.sun.star.beans.XPropertySet" }; return aSNS; diff --git a/comphelper/source/property/opropertybag.cxx b/comphelper/source/property/opropertybag.cxx index 066052b3f1d3..540c0a2f8dfc 100644 --- a/comphelper/source/property/opropertybag.cxx +++ b/comphelper/source/property/opropertybag.cxx @@ -74,7 +74,7 @@ namespace comphelper IMPLEMENT_FORWARD_XINTERFACE2( OPropertyBag, OPropertyBag_Base, OPropertyBag_PBase ) IMPLEMENT_FORWARD_XTYPEPROVIDER2( OPropertyBag, OPropertyBag_Base, OPropertyBag_PBase ) - void SAL_CALL OPropertyBag::initialize( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException, std::exception) + void SAL_CALL OPropertyBag::initialize( const Sequence< Any >& _rArguments ) { Sequence< Type > aTypes; bool AllowEmptyPropertyName(false); @@ -112,17 +112,17 @@ namespace comphelper } } - OUString SAL_CALL OPropertyBag::getImplementationName() throw (RuntimeException, std::exception) + OUString SAL_CALL OPropertyBag::getImplementationName() { return OUString( "com.sun.star.comp.comphelper.OPropertyBag" ); } - sal_Bool SAL_CALL OPropertyBag::supportsService( const OUString& rServiceName ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL OPropertyBag::supportsService( const OUString& rServiceName ) { return cppu::supportsService(this, rServiceName); } - Sequence< OUString > SAL_CALL OPropertyBag::getSupportedServiceNames( ) throw (RuntimeException, std::exception) + Sequence< OUString > SAL_CALL OPropertyBag::getSupportedServiceNames( ) { return { "com.sun.star.beans.PropertyBag" }; } @@ -163,40 +163,36 @@ namespace comphelper sal_Bool SAL_CALL OPropertyBag::isModified() - throw (RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); return m_isModified; } void SAL_CALL OPropertyBag::setModified( sal_Bool bModified ) - throw (PropertyVetoException, RuntimeException, std::exception) { setModifiedImpl(bModified, false); } void SAL_CALL OPropertyBag::addModifyListener( const Reference< XModifyListener > & xListener) - throw (RuntimeException, std::exception) { m_NotifyListeners.addInterface(xListener); } void SAL_CALL OPropertyBag::removeModifyListener( const Reference< XModifyListener > & xListener) - throw (RuntimeException, std::exception) { m_NotifyListeners.removeInterface(xListener); } - Reference< XPropertySetInfo > SAL_CALL OPropertyBag::getPropertySetInfo( ) throw(RuntimeException, std::exception) + Reference< XPropertySetInfo > SAL_CALL OPropertyBag::getPropertySetInfo( ) { return createPropertySetInfo( getInfoHelper() ); } - sal_Bool SAL_CALL OPropertyBag::has( const Any& /*aElement*/ ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL OPropertyBag::has( const Any& /*aElement*/ ) { // XSet is only a workaround for addProperty not being able to add default-void properties. // So, everything of XSet except insert is implemented empty @@ -204,7 +200,7 @@ namespace comphelper } - void SAL_CALL OPropertyBag::insert( const Any& _element ) throw (IllegalArgumentException, ElementExistException, RuntimeException, std::exception) + void SAL_CALL OPropertyBag::insert( const Any& _element ) { // This is a workaround for addProperty not being able to add default-void properties. // If we ever have a smarter XPropertyContainer::addProperty interface, we can remove this, ehm, well, hack. @@ -231,7 +227,7 @@ namespace comphelper } - void SAL_CALL OPropertyBag::remove( const Any& /*aElement*/ ) throw (IllegalArgumentException, NoSuchElementException, RuntimeException, std::exception) + void SAL_CALL OPropertyBag::remove( const Any& /*aElement*/ ) { // XSet is only a workaround for addProperty not being able to add default-void properties. // So, everything of XSet except insert is implemented empty @@ -239,7 +235,7 @@ namespace comphelper } - Reference< XEnumeration > SAL_CALL OPropertyBag::createEnumeration( ) throw (RuntimeException, std::exception) + Reference< XEnumeration > SAL_CALL OPropertyBag::createEnumeration( ) { // XSet is only a workaround for addProperty not being able to add default-void properties. // So, everything of XSet except insert is implemented empty @@ -247,7 +243,7 @@ namespace comphelper } - Type SAL_CALL OPropertyBag::getElementType( ) throw (RuntimeException, std::exception) + Type SAL_CALL OPropertyBag::getElementType( ) { // XSet is only a workaround for addProperty not being able to add default-void properties. // So, everything of XSet except insert is implemented empty @@ -255,7 +251,7 @@ namespace comphelper } - sal_Bool SAL_CALL OPropertyBag::hasElements( ) throw (RuntimeException, std::exception) + sal_Bool SAL_CALL OPropertyBag::hasElements( ) { // XSet is only a workaround for addProperty not being able to add default-void properties. // So, everything of XSet except insert is implemented empty @@ -268,12 +264,12 @@ namespace comphelper m_aDynamicProperties.getFastPropertyValue( _nHandle, _rValue ); } - sal_Bool SAL_CALL OPropertyBag::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) throw (IllegalArgumentException, UnknownPropertyException) + sal_Bool SAL_CALL OPropertyBag::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) { return m_aDynamicProperties.convertFastPropertyValue( _nHandle, _rValue, _rConvertedValue, _rOldValue ); } - void SAL_CALL OPropertyBag::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw (Exception, std::exception) + void SAL_CALL OPropertyBag::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) { m_aDynamicProperties.setFastPropertyValue( nHandle, rValue ); } @@ -314,7 +310,7 @@ namespace comphelper } - void SAL_CALL OPropertyBag::addProperty( const OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue ) throw (PropertyExistException, IllegalTypeException, IllegalArgumentException, RuntimeException, std::exception) + void SAL_CALL OPropertyBag::addProperty( const OUString& _rName, ::sal_Int16 _nAttributes, const Any& _rInitialValue ) { ::osl::ClearableMutexGuard g( m_aMutex ); @@ -337,7 +333,7 @@ namespace comphelper } - void SAL_CALL OPropertyBag::removeProperty( const OUString& _rName ) throw (UnknownPropertyException, NotRemoveableException, RuntimeException, std::exception) + void SAL_CALL OPropertyBag::removeProperty( const OUString& _rName ) { ::osl::ClearableMutexGuard g( m_aMutex ); @@ -380,7 +376,7 @@ namespace comphelper } - Sequence< PropertyValue > SAL_CALL OPropertyBag::getPropertyValues( ) throw (RuntimeException, std::exception) + Sequence< PropertyValue > SAL_CALL OPropertyBag::getPropertyValues( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -513,7 +509,7 @@ namespace comphelper } - void SAL_CALL OPropertyBag::setPropertyValues( const Sequence< PropertyValue >& _rProps ) throw (UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) + void SAL_CALL OPropertyBag::setPropertyValues( const Sequence< PropertyValue >& _rProps ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_setPropertyValues_throw( _rProps ); diff --git a/comphelper/source/property/opropertybag.hxx b/comphelper/source/property/opropertybag.hxx index ca2df4a9fa0a..678c457b563f 100644 --- a/comphelper/source/property/opropertybag.hxx +++ b/comphelper/source/property/opropertybag.hxx @@ -100,64 +100,59 @@ namespace comphelper /** === begin UNO interface implementations == **/ // XInitialization - virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL initialize( const css::uno::Sequence< css::uno::Any >& aArguments ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XModifiable: - virtual sal_Bool SAL_CALL isModified( ) - throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setModified( sal_Bool bModified ) - throw (css::beans::PropertyVetoException, - css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isModified( ) override; + virtual void SAL_CALL setModified( sal_Bool bModified ) override; // XModifyBroadcaster virtual void SAL_CALL addModifyListener( const css::uno::Reference< - css::util::XModifyListener > & xListener) - throw (css::uno::RuntimeException, std::exception) override; + css::util::XModifyListener > & xListener) override; virtual void SAL_CALL removeModifyListener( const css::uno::Reference< - css::util::XModifyListener > & xListener) - throw (css::uno::RuntimeException, std::exception) override; + css::util::XModifyListener > & xListener) override; // XPropertyContainer - virtual void SAL_CALL addProperty( const OUString& Name, ::sal_Int16 Attributes, const css::uno::Any& DefaultValue ) throw (css::beans::PropertyExistException, css::beans::IllegalTypeException, css::lang::IllegalArgumentException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL removeProperty( const OUString& Name ) throw (css::beans::UnknownPropertyException, css::beans::NotRemoveableException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addProperty( const OUString& Name, ::sal_Int16 Attributes, const css::uno::Any& DefaultValue ) override; + virtual void SAL_CALL removeProperty( const OUString& Name ) override; // XPropertyAccess - virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues( ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps ) throw (css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPropertyValues( ) override; + virtual void SAL_CALL setPropertyValues( const css::uno::Sequence< css::beans::PropertyValue >& aProps ) override; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setPropertyValue(const rtl::OUString& p1, const css::uno::Any& p2) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; + virtual void SAL_CALL setPropertyValue(const rtl::OUString& p1, const css::uno::Any& p2) override { OPropertyBag_PBase::setPropertyValue(p1, p2); } - virtual css::uno::Any SAL_CALL getPropertyValue(const rtl::OUString& p1) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + virtual css::uno::Any SAL_CALL getPropertyValue(const rtl::OUString& p1) override { return OPropertyBag_PBase::getPropertyValue(p1); } - virtual void SAL_CALL addPropertyChangeListener(const rtl::OUString& p1, const css::uno::Reference& p2) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL addPropertyChangeListener(const rtl::OUString& p1, const css::uno::Reference& p2) override { OPropertyBag_PBase::addPropertyChangeListener(p1, p2); } - virtual void SAL_CALL removePropertyChangeListener(const rtl::OUString& p1, const css::uno::Reference& p2) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removePropertyChangeListener(const rtl::OUString& p1, const css::uno::Reference& p2) override { OPropertyBag_PBase::removePropertyChangeListener(p1, p2); } - virtual void SAL_CALL addVetoableChangeListener(const rtl::OUString& p1, const css::uno::Reference& p2) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL addVetoableChangeListener(const rtl::OUString& p1, const css::uno::Reference& p2) override { OPropertyBag_PBase::addVetoableChangeListener(p1, p2); } - virtual void SAL_CALL removeVetoableChangeListener(const rtl::OUString& p1, const css::uno::Reference& p2) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL removeVetoableChangeListener(const rtl::OUString& p1, const css::uno::Reference& p2) override { OPropertyBag_PBase::removeVetoableChangeListener(p1, p2); } // XSet - virtual sal_Bool SAL_CALL has( const css::uno::Any& aElement ) throw (css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL insert( const css::uno::Any& aElement ) throw (css::lang::IllegalArgumentException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL remove( const css::uno::Any& aElement ) throw (css::lang::IllegalArgumentException, css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL has( const css::uno::Any& aElement ) override; + virtual void SAL_CALL insert( const css::uno::Any& aElement ) override; + virtual void SAL_CALL remove( const css::uno::Any& aElement ) override; // XEnumerationAccess (base of XSet) - 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 (base of XEnumerationAccess) - virtual css::uno::Type SAL_CALL getElementType( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasElements( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType( ) override; + virtual sal_Bool SAL_CALL hasElements( ) override; // UNO interface implementations // XPropertyState @@ -168,8 +163,8 @@ namespace comphelper // OPropertySetHelper virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle ) const override; - virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::lang::IllegalArgumentException, css::beans::UnknownPropertyException) override; - virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) throw (css::uno::Exception, std::exception) override; + virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) override; + virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) override; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper() override; // IEventNotificationHook diff --git a/comphelper/source/property/propagg.cxx b/comphelper/source/property/propagg.cxx index acc253b2ca17..35c6a5f9f917 100644 --- a/comphelper/source/property/propagg.cxx +++ b/comphelper/source/property/propagg.cxx @@ -141,7 +141,7 @@ OPropertyArrayAggregationHelper::PropertyOrigin OPropertyArrayAggregationHelper: } -Property OPropertyArrayAggregationHelper::getPropertyByName( const OUString& _rPropertyName ) throw( UnknownPropertyException ) +Property OPropertyArrayAggregationHelper::getPropertyByName( const OUString& _rPropertyName ) { const Property* pProperty = findPropertyByName( _rPropertyName ); @@ -273,7 +273,7 @@ namespace internal /// actually forwards a property value to the aggregate /// /// @throws Exception - void doForward( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception ); + void doForward( sal_Int32 _nHandle, const Any& _rValue ); sal_Int32 getCurrentlyForwardedProperty( ) const { return m_nCurrentlyForwarding; } }; @@ -298,7 +298,7 @@ namespace internal } - void PropertyForwarder::doForward( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception ) + void PropertyForwarder::doForward( sal_Int32 _nHandle, const Any& _rValue ) { OSL_ENSURE( m_rAggregationHelper.m_xAggregateSet.is(), "PropertyForwarder::doForward: no property set!" ); if ( m_rAggregationHelper.m_xAggregateSet.is() ) @@ -339,7 +339,7 @@ OPropertySetAggregationHelper::~OPropertySetAggregationHelper() } -css::uno::Any SAL_CALL OPropertySetAggregationHelper::queryInterface(const css::uno::Type& _rType) throw( css::uno::RuntimeException, std::exception) +css::uno::Any SAL_CALL OPropertySetAggregationHelper::queryInterface(const css::uno::Type& _rType) { css::uno::Any aReturn = OPropertyStateHelper::queryInterface(_rType); @@ -370,7 +370,7 @@ void OPropertySetAggregationHelper::disposing() } -void SAL_CALL OPropertySetAggregationHelper::disposing(const css::lang::EventObject& _rSource) throw ( css::uno::RuntimeException, std::exception) +void SAL_CALL OPropertySetAggregationHelper::disposing(const css::lang::EventObject& _rSource) { OSL_ENSURE(m_xAggregateSet.is(), "OPropertySetAggregationHelper::disposing : don't have an aggregate anymore !"); if (_rSource.Source == m_xAggregateSet) @@ -378,7 +378,7 @@ void SAL_CALL OPropertySetAggregationHelper::disposing(const css::lang::EventObj } -void SAL_CALL OPropertySetAggregationHelper::propertiesChange(const css::uno::Sequence< css::beans::PropertyChangeEvent>& _rEvents) throw( css::uno::RuntimeException, std::exception) +void SAL_CALL OPropertySetAggregationHelper::propertiesChange(const css::uno::Sequence< css::beans::PropertyChangeEvent>& _rEvents) { OSL_ENSURE(m_xAggregateSet.is(), "OPropertySetAggregationHelper::propertiesChange : have no aggregate !"); @@ -426,7 +426,7 @@ void SAL_CALL OPropertySetAggregationHelper::propertiesChange(const css::uno::Se } -void SAL_CALL OPropertySetAggregationHelper::vetoableChange(const css::beans::PropertyChangeEvent& _rEvent) throw( css::beans::PropertyVetoException, css::uno::RuntimeException, std::exception) +void SAL_CALL OPropertySetAggregationHelper::vetoableChange(const css::beans::PropertyChangeEvent& _rEvent) { OSL_ENSURE(m_xAggregateSet.is(), "OPropertySetAggregationHelper::vetoableChange : have no aggregate !"); @@ -438,7 +438,6 @@ void SAL_CALL OPropertySetAggregationHelper::vetoableChange(const css::beans::Pr void OPropertySetAggregationHelper::setAggregation(const css::uno::Reference< css::uno::XInterface >& _rxDelegate) - throw( css::lang::IllegalArgumentException ) { osl::MutexGuard aGuard(rBHelper.rMutex); @@ -478,7 +477,6 @@ void OPropertySetAggregationHelper::startListening() void SAL_CALL OPropertySetAggregationHelper::addVetoableChangeListener(const OUString& _rPropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener>& _rxListener) - throw( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { OPropertySetHelper::addVetoableChangeListener(_rPropertyName, _rxListener); if (!m_bListening) @@ -488,7 +486,6 @@ void SAL_CALL OPropertySetAggregationHelper::addVetoableChangeListener(const OUS void SAL_CALL OPropertySetAggregationHelper::addPropertyChangeListener(const OUString& _rPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener>& _rxListener) - throw( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { OPropertySetHelper::addPropertyChangeListener(_rPropertyName, _rxListener); if (!m_bListening) @@ -498,7 +495,6 @@ void SAL_CALL OPropertySetAggregationHelper::addPropertyChangeListener(const OUS void SAL_CALL OPropertySetAggregationHelper::addPropertiesChangeListener(const css::uno::Sequence< OUString >& _rPropertyNames, const css::uno::Reference< css::beans::XPropertiesChangeListener>& _rxListener) - throw( css::uno::RuntimeException, std::exception) { OPropertySetHelper::addPropertiesChangeListener(_rPropertyNames, _rxListener); if (!m_bListening) @@ -525,9 +521,6 @@ OUString OPropertySetAggregationHelper::getPropertyName( sal_Int32 _nHandle ) co void SAL_CALL OPropertySetAggregationHelper::setFastPropertyValue(sal_Int32 _nHandle, const css::uno::Any& _rValue) - throw( css::beans::UnknownPropertyException, css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() ); OUString aPropName; @@ -567,9 +560,6 @@ void OPropertySetAggregationHelper::getFastPropertyValue( css::uno::Any& rValue, css::uno::Any SAL_CALL OPropertySetAggregationHelper::getFastPropertyValue(sal_Int32 nHandle) - throw( css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() ); OUString aPropName; @@ -592,7 +582,6 @@ css::uno::Any SAL_CALL OPropertySetAggregationHelper::getFastPropertyValue(sal_I void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( const Sequence< OUString >& _rPropertyNames, const Sequence< Any >& _rValues ) - throw ( PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception ) { OSL_ENSURE( !rBHelper.bInDispose, "OPropertySetAggregationHelper::setPropertyValues : do not use within the dispose call !"); OSL_ENSURE( !rBHelper.bDisposed, "OPropertySetAggregationHelper::setPropertyValues : object is disposed" ); @@ -767,7 +756,6 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyValues( // XPropertyState css::beans::PropertyState SAL_CALL OPropertySetAggregationHelper::getPropertyState(const OUString& _rPropertyName) - throw( css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) { OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() ); sal_Int32 nHandle = rPH.getHandleByName( _rPropertyName ); @@ -792,7 +780,6 @@ css::beans::PropertyState SAL_CALL OPropertySetAggregationHelper::getPropertySta void SAL_CALL OPropertySetAggregationHelper::setPropertyToDefault(const OUString& _rPropertyName) - throw( css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) { OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() ); sal_Int32 nHandle = rPH.getHandleByName(_rPropertyName); @@ -825,7 +812,6 @@ void SAL_CALL OPropertySetAggregationHelper::setPropertyToDefault(const OUString css::uno::Any SAL_CALL OPropertySetAggregationHelper::getPropertyDefault(const OUString& aPropertyName) - throw( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { OPropertyArrayAggregationHelper& rPH = static_cast< OPropertyArrayAggregationHelper& >( getInfoHelper() ); sal_Int32 nHandle = rPH.getHandleByName( aPropertyName ); @@ -846,7 +832,7 @@ css::uno::Any SAL_CALL OPropertySetAggregationHelper::getPropertyDefault(const O return getPropertyDefaultByHandle(nHandle); } -sal_Bool SAL_CALL OPropertySetAggregationHelper::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) throw(IllegalArgumentException, css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL OPropertySetAggregationHelper::convertFastPropertyValue( Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) { bool bModified = false; @@ -866,7 +852,7 @@ sal_Bool SAL_CALL OPropertySetAggregationHelper::convertFastPropertyValue( Any& return bModified; } -void SAL_CALL OPropertySetAggregationHelper::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) throw ( Exception, std::exception ) +void SAL_CALL OPropertySetAggregationHelper::setFastPropertyValue_NoBroadcast( sal_Int32 _nHandle, const Any& _rValue ) { OSL_ENSURE( m_pForwarder->isResponsibleFor( _nHandle ), "OPropertySetAggregationHelper::setFastPropertyValue_NoBroadcast: this is no forwarded property - did you use declareForwardedProperty for it?" ); if ( m_pForwarder->isResponsibleFor( _nHandle ) ) diff --git a/comphelper/source/property/propertycontainer.cxx b/comphelper/source/property/propertycontainer.cxx index 813346270fc1..01674353465c 100644 --- a/comphelper/source/property/propertycontainer.cxx +++ b/comphelper/source/property/propertycontainer.cxx @@ -48,7 +48,7 @@ OPropertyContainer::~OPropertyContainer() } -Sequence< Type > OPropertyContainer::getBaseTypes() throw (RuntimeException, std::exception) +Sequence< Type > OPropertyContainer::getBaseTypes() { // just the types from our one and only base class ::cppu::OTypeCollection aTypes( @@ -60,21 +60,20 @@ Sequence< Type > OPropertyContainer::getBaseTypes() throw (RuntimeException, std } -void SAL_CALL OPropertyContainer::setFastPropertyValue( sal_Int32 nHandle, const Any& rValue ) throw ( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL OPropertyContainer::setFastPropertyValue( sal_Int32 nHandle, const Any& rValue ) { OPropertySetHelper::setFastPropertyValue( nHandle, rValue ); } sal_Bool OPropertyContainer::convertFastPropertyValue( - Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) throw (IllegalArgumentException) + Any& _rConvertedValue, Any& _rOldValue, sal_Int32 _nHandle, const Any& _rValue ) { return OPropertyContainerHelper::convertFastPropertyValue( _rConvertedValue, _rOldValue, _nHandle, _rValue ); } void OPropertyContainer::setFastPropertyValue_NoBroadcast(sal_Int32 _nHandle, const Any& _rValue) - throw (Exception, std::exception) { OPropertyContainerHelper::setFastPropertyValue( _nHandle, _rValue ); } diff --git a/comphelper/source/property/propertysethelper.cxx b/comphelper/source/property/propertysethelper.cxx index 614a035f9166..5005fb626653 100644 --- a/comphelper/source/property/propertysethelper.cxx +++ b/comphelper/source/property/propertysethelper.cxx @@ -74,12 +74,12 @@ PropertySetHelper::~PropertySetHelper() throw() } // XPropertySet -Reference< XPropertySetInfo > SAL_CALL PropertySetHelper::getPropertySetInfo( ) throw(RuntimeException, std::exception) +Reference< XPropertySetInfo > SAL_CALL PropertySetHelper::getPropertySetInfo( ) { return mpImpl->mpInfo; } -void SAL_CALL PropertySetHelper::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) throw(UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL PropertySetHelper::setPropertyValue( const OUString& aPropertyName, const Any& aValue ) { PropertyMapEntry const * aEntries[2]; aEntries[0] = mpImpl->find( aPropertyName ); @@ -92,7 +92,7 @@ void SAL_CALL PropertySetHelper::setPropertyValue( const OUString& aPropertyName _setPropertyValues( aEntries, &aValue ); } -Any SAL_CALL PropertySetHelper::getPropertyValue( const OUString& PropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +Any SAL_CALL PropertySetHelper::getPropertyValue( const OUString& PropertyName ) { PropertyMapEntry const * aEntries[2]; aEntries[0] = mpImpl->find( PropertyName ); @@ -108,29 +108,28 @@ Any SAL_CALL PropertySetHelper::getPropertyValue( const OUString& PropertyName ) return aAny; } -void SAL_CALL PropertySetHelper::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL PropertySetHelper::addPropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) { // todo } -void SAL_CALL PropertySetHelper::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL PropertySetHelper::removePropertyChangeListener( const OUString&, const Reference< XPropertyChangeListener >& ) { // todo } -void SAL_CALL PropertySetHelper::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL PropertySetHelper::addVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) { // todo } -void SAL_CALL PropertySetHelper::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +void SAL_CALL PropertySetHelper::removeVetoableChangeListener( const OUString&, const Reference< XVetoableChangeListener >& ) { // todo } // XMultiPropertySet void SAL_CALL PropertySetHelper::setPropertyValues( const Sequence< OUString >& rPropertyNames, const Sequence< Any >& rValues ) - throw (PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) { const sal_Int32 nCount = rPropertyNames.getLength(); @@ -160,7 +159,6 @@ void SAL_CALL PropertySetHelper::setPropertyValues( const Sequence< OUString >& } Sequence< Any > SAL_CALL PropertySetHelper::getPropertyValues(const Sequence< OUString >& rPropertyNames) - throw (RuntimeException, std::exception) { const sal_Int32 nCount = rPropertyNames.getLength(); @@ -192,23 +190,23 @@ Sequence< Any > SAL_CALL PropertySetHelper::getPropertyValues(const Sequence< OU return aValues; } -void SAL_CALL PropertySetHelper::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw(RuntimeException, std::exception) +void SAL_CALL PropertySetHelper::addPropertiesChangeListener( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) { // todo } -void SAL_CALL PropertySetHelper::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& ) throw(RuntimeException, std::exception) +void SAL_CALL PropertySetHelper::removePropertiesChangeListener( const Reference< XPropertiesChangeListener >& ) { // todo } -void SAL_CALL PropertySetHelper::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) throw(RuntimeException, std::exception) +void SAL_CALL PropertySetHelper::firePropertiesChangeEvent( const Sequence< OUString >&, const Reference< XPropertiesChangeListener >& ) { // todo } // XPropertyState -PropertyState SAL_CALL PropertySetHelper::getPropertyState( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception) +PropertyState SAL_CALL PropertySetHelper::getPropertyState( const OUString& PropertyName ) { PropertyMapEntry const * aEntries[2]; @@ -224,7 +222,7 @@ PropertyState SAL_CALL PropertySetHelper::getPropertyState( const OUString& Prop return aState; } -Sequence< PropertyState > SAL_CALL PropertySetHelper::getPropertyStates( const Sequence< OUString >& aPropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception) +Sequence< PropertyState > SAL_CALL PropertySetHelper::getPropertyStates( const Sequence< OUString >& aPropertyName ) { const sal_Int32 nCount = aPropertyName.getLength(); @@ -257,7 +255,7 @@ Sequence< PropertyState > SAL_CALL PropertySetHelper::getPropertyStates( const S return aStates; } -void SAL_CALL PropertySetHelper::setPropertyToDefault( const OUString& PropertyName ) throw(UnknownPropertyException, RuntimeException, std::exception) +void SAL_CALL PropertySetHelper::setPropertyToDefault( const OUString& PropertyName ) { PropertyMapEntry const *pEntry = mpImpl->find( PropertyName ); if( nullptr == pEntry ) @@ -266,7 +264,7 @@ void SAL_CALL PropertySetHelper::setPropertyToDefault( const OUString& PropertyN _setPropertyToDefault( pEntry ); } -Any SAL_CALL PropertySetHelper::getPropertyDefault( const OUString& aPropertyName ) throw(UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) +Any SAL_CALL PropertySetHelper::getPropertyDefault( const OUString& aPropertyName ) { PropertyMapEntry const * pEntry = mpImpl->find( aPropertyName ); if( nullptr == pEntry ) @@ -277,20 +275,17 @@ Any SAL_CALL PropertySetHelper::getPropertyDefault( const OUString& aPropertyNam void PropertySetHelper::_getPropertyStates( const comphelper::PropertyMapEntry**, PropertyState*) -throw (UnknownPropertyException, RuntimeException) { OSL_FAIL( "you have to implement this yourself!"); } void PropertySetHelper::_setPropertyToDefault(const comphelper::PropertyMapEntry*) -throw (UnknownPropertyException, RuntimeException) { OSL_FAIL( "you have to implement this yourself!"); } Any PropertySetHelper::_getPropertyDefault(const comphelper::PropertyMapEntry*) -throw (UnknownPropertyException, WrappedTargetException, RuntimeException) { OSL_FAIL( "you have to implement this yourself!"); diff --git a/comphelper/source/property/propertysetinfo.cxx b/comphelper/source/property/propertysetinfo.cxx index 0673b6ffe93b..a77a32799c7d 100644 --- a/comphelper/source/property/propertysetinfo.cxx +++ b/comphelper/source/property/propertysetinfo.cxx @@ -44,7 +44,7 @@ public: const PropertyMap& getPropertyMap() const throw() { return maPropertyMap;} /// @throws UnknownPropertyException - Property getPropertyByName( const OUString& aName ) throw( UnknownPropertyException ); + Property getPropertyByName( const OUString& aName ); bool hasPropertyByName( const OUString& aName ) throw(); private: @@ -106,7 +106,7 @@ std::vector< Property > const & PropertyMapImpl::getProperties() throw() } -Property PropertyMapImpl::getPropertyByName( const OUString& aName ) throw( UnknownPropertyException ) +Property PropertyMapImpl::getPropertyByName( const OUString& aName ) { PropertyMap::iterator aIter = maPropertyMap.find( aName ); @@ -167,17 +167,17 @@ void PropertySetInfo::remove( const OUString& aName ) throw() mpImpl->remove( aName ); } -Sequence< css::beans::Property > SAL_CALL PropertySetInfo::getProperties() throw(css::uno::RuntimeException, std::exception) +Sequence< css::beans::Property > SAL_CALL PropertySetInfo::getProperties() { return comphelper::containerToSequence(mpImpl->getProperties()); } -Property SAL_CALL PropertySetInfo::getPropertyByName( const OUString& aName ) throw(css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) +Property SAL_CALL PropertySetInfo::getPropertyByName( const OUString& aName ) { return mpImpl->getPropertyByName( aName ); } -sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName( const OUString& Name ) throw(css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL PropertySetInfo::hasPropertyByName( const OUString& Name ) { return mpImpl->hasPropertyByName( Name ); } diff --git a/comphelper/source/property/propertystatecontainer.cxx b/comphelper/source/property/propertystatecontainer.cxx index b315a6662520..063cc79e35b4 100644 --- a/comphelper/source/property/propertystatecontainer.cxx +++ b/comphelper/source/property/propertystatecontainer.cxx @@ -51,7 +51,7 @@ namespace comphelper } - Any SAL_CALL OPropertyStateContainer::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception) + Any SAL_CALL OPropertyStateContainer::queryInterface( const Type& _rType ) { Any aReturn = OPropertyContainer::queryInterface( _rType ); if ( !aReturn.hasValue() ) @@ -76,13 +76,13 @@ namespace comphelper } - PropertyState SAL_CALL OPropertyStateContainer::getPropertyState( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception) + PropertyState SAL_CALL OPropertyStateContainer::getPropertyState( const OUString& _rPropertyName ) { return getPropertyStateByHandle( getHandleForName( _rPropertyName ) ); } - Sequence< PropertyState > SAL_CALL OPropertyStateContainer::getPropertyStates( const Sequence< OUString >& _rPropertyNames ) throw (UnknownPropertyException, RuntimeException, std::exception) + Sequence< PropertyState > SAL_CALL OPropertyStateContainer::getPropertyStates( const Sequence< OUString >& _rPropertyNames ) { sal_Int32 nProperties = _rPropertyNames.getLength(); Sequence< PropertyState> aStates( nProperties ); @@ -135,13 +135,13 @@ namespace comphelper } - void SAL_CALL OPropertyStateContainer::setPropertyToDefault( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException, std::exception) + void SAL_CALL OPropertyStateContainer::setPropertyToDefault( const OUString& _rPropertyName ) { setPropertyToDefaultByHandle( getHandleForName( _rPropertyName ) ); } - Any SAL_CALL OPropertyStateContainer::getPropertyDefault( const OUString& _rPropertyName ) throw (UnknownPropertyException, WrappedTargetException, RuntimeException, std::exception) + Any SAL_CALL OPropertyStateContainer::getPropertyDefault( const OUString& _rPropertyName ) { Any aDefault; getPropertyDefaultByHandle( getHandleForName( _rPropertyName ), aDefault ); diff --git a/comphelper/source/property/propmultiplex.cxx b/comphelper/source/property/propmultiplex.cxx index e10d85a0c343..5508677396b3 100644 --- a/comphelper/source/property/propmultiplex.cxx +++ b/comphelper/source/property/propmultiplex.cxx @@ -37,7 +37,6 @@ OPropertyChangeListener::~OPropertyChangeListener() void OPropertyChangeListener::_disposing(const EventObject&) - throw (RuntimeException, std::exception) { // nothing to do here } @@ -108,7 +107,7 @@ void OPropertyChangeMultiplexer::dispose() // XEventListener -void SAL_CALL OPropertyChangeMultiplexer::disposing( const EventObject& _rSource) throw( RuntimeException, std::exception) +void SAL_CALL OPropertyChangeMultiplexer::disposing( const EventObject& _rSource) { if (m_pListener) { @@ -129,7 +128,7 @@ void SAL_CALL OPropertyChangeMultiplexer::disposing( const EventObject& _rSourc // XPropertyChangeListener -void SAL_CALL OPropertyChangeMultiplexer::propertyChange( const PropertyChangeEvent& _rEvent ) throw( RuntimeException, std::exception) +void SAL_CALL OPropertyChangeMultiplexer::propertyChange( const PropertyChangeEvent& _rEvent ) { if (m_pListener && !locked()) m_pListener->_propertyChanged(_rEvent); diff --git a/comphelper/source/property/propstate.cxx b/comphelper/source/property/propstate.cxx index 5272ebf725a1..e0830099b896 100644 --- a/comphelper/source/property/propstate.cxx +++ b/comphelper/source/property/propstate.cxx @@ -40,7 +40,7 @@ namespace comphelper // OPropertyStateHelper - css::uno::Any SAL_CALL OPropertyStateHelper::queryInterface(const css::uno::Type& _rType) throw( css::uno::RuntimeException, std::exception) + css::uno::Any SAL_CALL OPropertyStateHelper::queryInterface(const css::uno::Type& _rType) { css::uno::Any aReturn = OPropertySetHelper2::queryInterface(_rType); // our own ifaces @@ -76,7 +76,7 @@ namespace comphelper // XPropertyState - css::beans::PropertyState SAL_CALL OPropertyStateHelper::getPropertyState(const OUString& _rsName) throw( css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) + css::beans::PropertyState SAL_CALL OPropertyStateHelper::getPropertyState(const OUString& _rsName) { cppu::IPropertyArrayHelper& rPH = getInfoHelper(); sal_Int32 nHandle = rPH.getHandleByName(_rsName); @@ -88,7 +88,7 @@ namespace comphelper } - void SAL_CALL OPropertyStateHelper::setPropertyToDefault(const OUString& _rsName) throw( css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) + void SAL_CALL OPropertyStateHelper::setPropertyToDefault(const OUString& _rsName) { cppu::IPropertyArrayHelper& rPH = getInfoHelper(); sal_Int32 nHandle = rPH.getHandleByName(_rsName); @@ -100,7 +100,7 @@ namespace comphelper } - css::uno::Any SAL_CALL OPropertyStateHelper::getPropertyDefault(const OUString& _rsName) throw( css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) + css::uno::Any SAL_CALL OPropertyStateHelper::getPropertyDefault(const OUString& _rsName) { cppu::IPropertyArrayHelper& rPH = getInfoHelper(); sal_Int32 nHandle = rPH.getHandleByName(_rsName); @@ -112,7 +112,7 @@ namespace comphelper } - css::uno::Sequence< css::beans::PropertyState> SAL_CALL OPropertyStateHelper::getPropertyStates(const css::uno::Sequence< OUString >& _rPropertyNames) throw( css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) + css::uno::Sequence< css::beans::PropertyState> SAL_CALL OPropertyStateHelper::getPropertyStates(const css::uno::Sequence< OUString >& _rPropertyNames) { sal_Int32 nLen = _rPropertyNames.getLength(); css::uno::Sequence< css::beans::PropertyState> aRet(nLen); @@ -184,7 +184,7 @@ namespace comphelper } - Sequence< Type > SAL_CALL OStatefulPropertySet::getTypes() throw(RuntimeException, std::exception) + Sequence< Type > SAL_CALL OStatefulPropertySet::getTypes() { Sequence< Type > aOwnTypes( 2 ); aOwnTypes[0] = cppu::UnoType::get(); @@ -196,13 +196,13 @@ namespace comphelper ); } - Sequence< sal_Int8 > SAL_CALL OStatefulPropertySet::getImplementationId() throw(RuntimeException, std::exception) + Sequence< sal_Int8 > SAL_CALL OStatefulPropertySet::getImplementationId() { return css::uno::Sequence(); } - Any SAL_CALL OStatefulPropertySet::queryInterface( const Type& _rType ) throw(RuntimeException, std::exception) + Any SAL_CALL OStatefulPropertySet::queryInterface( const Type& _rType ) { Any aReturn = OWeakObject::queryInterface( _rType ); if ( !aReturn.hasValue() ) diff --git a/comphelper/source/streaming/memorystream.cxx b/comphelper/source/streaming/memorystream.cxx index addb09306837..da162ef75c12 100644 --- a/comphelper/source/streaming/memorystream.cxx +++ b/comphelper/source/streaming/memorystream.cxx @@ -47,33 +47,33 @@ public: UNOMemoryStream(); // XServiceInfo - virtual OUString SAL_CALL getImplementationName() throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) throw (css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence SAL_CALL getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService(const OUString& ServiceName) override; + virtual css::uno::Sequence SAL_CALL getSupportedServiceNames() override; // XStream - virtual Reference< XInputStream > SAL_CALL getInputStream( ) throw (RuntimeException, std::exception) override; - virtual Reference< XOutputStream > SAL_CALL getOutputStream( ) throw (RuntimeException, std::exception) override; + virtual Reference< XInputStream > SAL_CALL getInputStream( ) override; + virtual Reference< XOutputStream > SAL_CALL getOutputStream( ) override; // XInputStream - virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override; - virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL available() throw (NotConnectedException, IOException, RuntimeException, std::exception) override; - virtual void SAL_CALL closeInput() throw (NotConnectedException, IOException, RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) override; + virtual sal_Int32 SAL_CALL readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) override; + virtual void SAL_CALL skipBytes( sal_Int32 nBytesToSkip ) override; + virtual sal_Int32 SAL_CALL available() override; + virtual void SAL_CALL closeInput() override; // XSeekable - virtual void SAL_CALL seek( sal_Int64 location ) throw (IllegalArgumentException, IOException, RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getPosition() throw (IOException, RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getLength() throw (IOException, RuntimeException, std::exception) override; + virtual void SAL_CALL seek( sal_Int64 location ) override; + virtual sal_Int64 SAL_CALL getPosition() override; + virtual sal_Int64 SAL_CALL getLength() override; // XOutputStream - virtual void SAL_CALL writeBytes( const Sequence< sal_Int8 >& aData ) throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override; - virtual void SAL_CALL flush() throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override; - virtual void SAL_CALL closeOutput() throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) override; + virtual void SAL_CALL writeBytes( const Sequence< sal_Int8 >& aData ) override; + virtual void SAL_CALL flush() override; + virtual void SAL_CALL closeOutput() override; // XTruncate - virtual void SAL_CALL truncate() throw (css::io::IOException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL truncate() override; private: std::vector< sal_Int8 > maData; @@ -86,34 +86,34 @@ UNOMemoryStream::UNOMemoryStream() } // XServiceInfo -OUString SAL_CALL UNOMemoryStream::getImplementationName() throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL UNOMemoryStream::getImplementationName() { return OUString("com.sun.star.comp.MemoryStream"); } -sal_Bool SAL_CALL UNOMemoryStream::supportsService(const OUString& ServiceName) throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL UNOMemoryStream::supportsService(const OUString& ServiceName) { return cppu::supportsService(this, ServiceName); } -css::uno::Sequence SAL_CALL UNOMemoryStream::getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) +css::uno::Sequence SAL_CALL UNOMemoryStream::getSupportedServiceNames() { return { "com.sun.star.comp.MemoryStream" }; } // XStream -Reference< XInputStream > SAL_CALL UNOMemoryStream::getInputStream( ) throw (RuntimeException, std::exception) +Reference< XInputStream > SAL_CALL UNOMemoryStream::getInputStream( ) { return this; } -Reference< XOutputStream > SAL_CALL UNOMemoryStream::getOutputStream( ) throw (RuntimeException, std::exception) +Reference< XOutputStream > SAL_CALL UNOMemoryStream::getOutputStream( ) { return this; } // XInputStream -sal_Int32 SAL_CALL UNOMemoryStream::readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) +sal_Int32 SAL_CALL UNOMemoryStream::readBytes( Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) { if( nBytesToRead < 0 ) throw IOException(); @@ -133,12 +133,12 @@ sal_Int32 SAL_CALL UNOMemoryStream::readBytes( Sequence< sal_Int8 >& aData, sal_ return nBytesToRead; } -sal_Int32 SAL_CALL UNOMemoryStream::readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) +sal_Int32 SAL_CALL UNOMemoryStream::readSomeBytes( Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) { return readBytes( aData, nMaxBytesToRead ); } -void SAL_CALL UNOMemoryStream::skipBytes( sal_Int32 nBytesToSkip ) throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) +void SAL_CALL UNOMemoryStream::skipBytes( sal_Int32 nBytesToSkip ) { if( nBytesToSkip < 0 ) throw IOException(); @@ -146,18 +146,18 @@ void SAL_CALL UNOMemoryStream::skipBytes( sal_Int32 nBytesToSkip ) throw (NotCon mnCursor += std::min( nBytesToSkip, available() ); } -sal_Int32 SAL_CALL UNOMemoryStream::available() throw (NotConnectedException, IOException, RuntimeException, std::exception) +sal_Int32 SAL_CALL UNOMemoryStream::available() { return static_cast< sal_Int32 >( maData.size() ) - mnCursor; } -void SAL_CALL UNOMemoryStream::closeInput() throw (NotConnectedException, IOException, RuntimeException, std::exception) +void SAL_CALL UNOMemoryStream::closeInput() { mnCursor = 0; } // XSeekable -void SAL_CALL UNOMemoryStream::seek( sal_Int64 location ) throw (IllegalArgumentException, IOException, RuntimeException, std::exception) +void SAL_CALL UNOMemoryStream::seek( sal_Int64 location ) { if( (location < 0) || (location > SAL_MAX_INT32) ) throw IllegalArgumentException("this implementation does not support more than 2GB!", static_cast(this), 0 ); @@ -172,18 +172,18 @@ void SAL_CALL UNOMemoryStream::seek( sal_Int64 location ) throw (IllegalArgument mnCursor = static_cast< sal_Int32 >( location ); } -sal_Int64 SAL_CALL UNOMemoryStream::getPosition() throw (IOException, RuntimeException, std::exception) +sal_Int64 SAL_CALL UNOMemoryStream::getPosition() { return static_cast< sal_Int64 >( mnCursor ); } -sal_Int64 SAL_CALL UNOMemoryStream::getLength() throw (IOException, RuntimeException, std::exception) +sal_Int64 SAL_CALL UNOMemoryStream::getLength() { return static_cast< sal_Int64 >( maData.size() ); } // XOutputStream -void SAL_CALL UNOMemoryStream::writeBytes( const Sequence< sal_Int8 >& aData ) throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) +void SAL_CALL UNOMemoryStream::writeBytes( const Sequence< sal_Int8 >& aData ) { const sal_Int32 nBytesToWrite( aData.getLength() ); if( nBytesToWrite ) @@ -206,17 +206,17 @@ void SAL_CALL UNOMemoryStream::writeBytes( const Sequence< sal_Int8 >& aData ) t } } -void SAL_CALL UNOMemoryStream::flush() throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) +void SAL_CALL UNOMemoryStream::flush() { } -void SAL_CALL UNOMemoryStream::closeOutput() throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) +void SAL_CALL UNOMemoryStream::closeOutput() { mnCursor = 0; } //XTruncate -void SAL_CALL UNOMemoryStream::truncate() throw (IOException, RuntimeException, std::exception) +void SAL_CALL UNOMemoryStream::truncate() { maData.resize( 0 ); mnCursor = 0; diff --git a/comphelper/source/streaming/oslfile2streamwrap.cxx b/comphelper/source/streaming/oslfile2streamwrap.cxx index 77e9ff6cfe31..defbdf3cc313 100644 --- a/comphelper/source/streaming/oslfile2streamwrap.cxx +++ b/comphelper/source/streaming/oslfile2streamwrap.cxx @@ -38,7 +38,6 @@ OSLInputStreamWrapper::~OSLInputStreamWrapper() sal_Int32 SAL_CALL OSLInputStreamWrapper::readBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead) - throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception ) { if (!m_pFile) throw css::io::NotConnectedException(OUString(), static_cast(this)); @@ -63,7 +62,7 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::readBytes(css::uno::Sequence< sal_Int8 } -sal_Int32 SAL_CALL OSLInputStreamWrapper::readSomeBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception ) +sal_Int32 SAL_CALL OSLInputStreamWrapper::readSomeBytes(css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead) { if (!m_pFile) throw css::io::NotConnectedException(OUString(), static_cast(this)); @@ -75,7 +74,7 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::readSomeBytes(css::uno::Sequence< sal_ } -void SAL_CALL OSLInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception ) +void SAL_CALL OSLInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) { ::osl::MutexGuard aGuard( m_aMutex ); if (!m_pFile) @@ -93,7 +92,7 @@ void SAL_CALL OSLInputStreamWrapper::skipBytes(sal_Int32 nBytesToSkip) throw( cs } -sal_Int32 SAL_CALL OSLInputStreamWrapper::available() throw( css::io::NotConnectedException, css::uno::RuntimeException, std::exception ) +sal_Int32 SAL_CALL OSLInputStreamWrapper::available() { ::osl::MutexGuard aGuard( m_aMutex ); if (!m_pFile) @@ -123,7 +122,7 @@ sal_Int32 SAL_CALL OSLInputStreamWrapper::available() throw( css::io::NotConnect } -void SAL_CALL OSLInputStreamWrapper::closeInput() throw( css::io::NotConnectedException, css::uno::RuntimeException, std::exception ) +void SAL_CALL OSLInputStreamWrapper::closeInput() { if (!m_pFile) throw css::io::NotConnectedException(OUString(), static_cast(this)); @@ -143,7 +142,7 @@ OSLOutputStreamWrapper::OSLOutputStreamWrapper(osl::File & _rFile): OSLOutputStreamWrapper::~OSLOutputStreamWrapper() {} -void SAL_CALL OSLOutputStreamWrapper::writeBytes(const css::uno::Sequence< sal_Int8 >& aData) throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception ) +void SAL_CALL OSLOutputStreamWrapper::writeBytes(const css::uno::Sequence< sal_Int8 >& aData) { sal_uInt64 nWritten; FileBase::RC eError = rFile.write(aData.getConstArray(),aData.getLength(), nWritten); @@ -155,12 +154,12 @@ void SAL_CALL OSLOutputStreamWrapper::writeBytes(const css::uno::Sequence< sal_I } -void SAL_CALL OSLOutputStreamWrapper::flush() throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception ) +void SAL_CALL OSLOutputStreamWrapper::flush() { } -void SAL_CALL OSLOutputStreamWrapper::closeOutput() throw( css::io::NotConnectedException, css::io::BufferSizeExceededException, css::uno::RuntimeException, std::exception ) +void SAL_CALL OSLOutputStreamWrapper::closeOutput() { rFile.close(); } diff --git a/comphelper/source/streaming/seekableinput.cxx b/comphelper/source/streaming/seekableinput.cxx index 7a39696f0497..2d14cd0aadb8 100644 --- a/comphelper/source/streaming/seekableinput.cxx +++ b/comphelper/source/streaming/seekableinput.cxx @@ -116,10 +116,6 @@ void OSeekableInputWrapper::PrepareCopy_Impl() // XInputStream sal_Int32 SAL_CALL OSeekableInputWrapper::readBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) - throw ( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -133,10 +129,6 @@ sal_Int32 SAL_CALL OSeekableInputWrapper::readBytes( uno::Sequence< sal_Int8 >& sal_Int32 SAL_CALL OSeekableInputWrapper::readSomeBytes( uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) - throw ( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -150,10 +142,6 @@ sal_Int32 SAL_CALL OSeekableInputWrapper::readSomeBytes( uno::Sequence< sal_Int8 void SAL_CALL OSeekableInputWrapper::skipBytes( sal_Int32 nBytesToSkip ) - throw ( io::NotConnectedException, - io::BufferSizeExceededException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -167,9 +155,6 @@ void SAL_CALL OSeekableInputWrapper::skipBytes( sal_Int32 nBytesToSkip ) sal_Int32 SAL_CALL OSeekableInputWrapper::available() - throw ( io::NotConnectedException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -183,9 +168,6 @@ sal_Int32 SAL_CALL OSeekableInputWrapper::available() void SAL_CALL OSeekableInputWrapper::closeInput() - throw ( io::NotConnectedException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -208,9 +190,6 @@ void SAL_CALL OSeekableInputWrapper::closeInput() // XSeekable void SAL_CALL OSeekableInputWrapper::seek( sal_Int64 location ) - throw ( lang::IllegalArgumentException, - io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -224,8 +203,6 @@ void SAL_CALL OSeekableInputWrapper::seek( sal_Int64 location ) sal_Int64 SAL_CALL OSeekableInputWrapper::getPosition() - throw ( io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -239,8 +216,6 @@ sal_Int64 SAL_CALL OSeekableInputWrapper::getPosition() sal_Int64 SAL_CALL OSeekableInputWrapper::getLength() - throw ( io::IOException, - uno::RuntimeException, std::exception ) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/comphelper/source/streaming/seqinputstreamserv.cxx b/comphelper/source/streaming/seqinputstreamserv.cxx index d9e372238637..9ed69589b730 100644 --- a/comphelper/source/streaming/seqinputstreamserv.cxx +++ b/comphelper/source/streaming/seqinputstreamserv.cxx @@ -53,24 +53,24 @@ public: const SequenceInputStreamService& operator=(const SequenceInputStreamService&) = delete; // css::lang::XServiceInfo: - virtual OUString SAL_CALL getImplementationName() throw ( uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString & ServiceName ) throw ( uno::RuntimeException, std::exception ) override; - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString & ServiceName ) override; + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // css::io::XInputStream: - virtual ::sal_Int32 SAL_CALL readBytes( uno::Sequence< ::sal_Int8 > & aData, ::sal_Int32 nBytesToRead ) throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception ) override; - virtual ::sal_Int32 SAL_CALL readSomeBytes( uno::Sequence< ::sal_Int8 > & aData, ::sal_Int32 nMaxBytesToRead ) throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception ) override; - virtual void SAL_CALL skipBytes( ::sal_Int32 nBytesToSkip ) throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception ) override; - virtual ::sal_Int32 SAL_CALL available() throw ( uno::RuntimeException, io::NotConnectedException, io::IOException, std::exception ) override; - virtual void SAL_CALL closeInput() throw ( uno::RuntimeException, io::NotConnectedException, io::IOException, std::exception ) override; + virtual ::sal_Int32 SAL_CALL readBytes( uno::Sequence< ::sal_Int8 > & aData, ::sal_Int32 nBytesToRead ) override; + virtual ::sal_Int32 SAL_CALL readSomeBytes( uno::Sequence< ::sal_Int8 > & aData, ::sal_Int32 nMaxBytesToRead ) override; + virtual void SAL_CALL skipBytes( ::sal_Int32 nBytesToSkip ) override; + virtual ::sal_Int32 SAL_CALL available() override; + virtual void SAL_CALL closeInput() override; // css::io::XSeekable: - virtual void SAL_CALL seek( ::sal_Int64 location ) throw ( uno::RuntimeException, lang::IllegalArgumentException, io::IOException, std::exception ) override; - virtual ::sal_Int64 SAL_CALL getPosition() throw ( uno::RuntimeException, io::IOException, std::exception ) override; - virtual ::sal_Int64 SAL_CALL getLength() throw ( uno::RuntimeException, io::IOException, std::exception ) override; + virtual void SAL_CALL seek( ::sal_Int64 location ) override; + virtual ::sal_Int64 SAL_CALL getPosition() override; + virtual ::sal_Int64 SAL_CALL getLength() override; // css::lang::XInitialization: - virtual void SAL_CALL initialize( const uno::Sequence< css::uno::Any > & aArguments ) throw ( uno::RuntimeException, uno::Exception, std::exception ) override; + virtual void SAL_CALL initialize( const uno::Sequence< css::uno::Any > & aArguments ) override; private: virtual ~SequenceInputStreamService() override {} @@ -87,24 +87,24 @@ SequenceInputStreamService::SequenceInputStreamService() {} // com.sun.star.uno.XServiceInfo: -OUString SAL_CALL SequenceInputStreamService::getImplementationName() throw ( uno::RuntimeException, std::exception ) +OUString SAL_CALL SequenceInputStreamService::getImplementationName() { return OUString ( "com.sun.star.comp.SequenceInputStreamService" ); } -sal_Bool SAL_CALL SequenceInputStreamService::supportsService( OUString const & serviceName ) throw ( uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL SequenceInputStreamService::supportsService( OUString const & serviceName ) { return cppu::supportsService(this, serviceName); } -uno::Sequence< OUString > SAL_CALL SequenceInputStreamService::getSupportedServiceNames() throw ( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SAL_CALL SequenceInputStreamService::getSupportedServiceNames() { uno::Sequence s { "com.sun.star.io.SequenceInputStream" }; return s; } // css::io::XInputStream: -::sal_Int32 SAL_CALL SequenceInputStreamService::readBytes( uno::Sequence< ::sal_Int8 > & aData, ::sal_Int32 nBytesToRead ) throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception ) +::sal_Int32 SAL_CALL SequenceInputStreamService::readBytes( uno::Sequence< ::sal_Int8 > & aData, ::sal_Int32 nBytesToRead ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xInputStream.is() ) @@ -113,7 +113,7 @@ uno::Sequence< OUString > SAL_CALL SequenceInputStreamService::getSupportedServi return m_xInputStream->readBytes( aData, nBytesToRead ); } -::sal_Int32 SAL_CALL SequenceInputStreamService::readSomeBytes( uno::Sequence< ::sal_Int8 > & aData, ::sal_Int32 nMaxBytesToRead ) throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception ) +::sal_Int32 SAL_CALL SequenceInputStreamService::readSomeBytes( uno::Sequence< ::sal_Int8 > & aData, ::sal_Int32 nMaxBytesToRead ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xInputStream.is() ) @@ -122,7 +122,7 @@ uno::Sequence< OUString > SAL_CALL SequenceInputStreamService::getSupportedServi return m_xInputStream->readSomeBytes( aData, nMaxBytesToRead ); } -void SAL_CALL SequenceInputStreamService::skipBytes( ::sal_Int32 nBytesToSkip ) throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception ) +void SAL_CALL SequenceInputStreamService::skipBytes( ::sal_Int32 nBytesToSkip ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xInputStream.is() ) @@ -131,7 +131,7 @@ void SAL_CALL SequenceInputStreamService::skipBytes( ::sal_Int32 nBytesToSkip ) return m_xInputStream->skipBytes( nBytesToSkip ); } -::sal_Int32 SAL_CALL SequenceInputStreamService::available() throw ( uno::RuntimeException, io::NotConnectedException, io::IOException, std::exception ) +::sal_Int32 SAL_CALL SequenceInputStreamService::available() { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xInputStream.is() ) @@ -140,7 +140,7 @@ void SAL_CALL SequenceInputStreamService::skipBytes( ::sal_Int32 nBytesToSkip ) return m_xInputStream->available(); } -void SAL_CALL SequenceInputStreamService::closeInput() throw ( uno::RuntimeException, io::NotConnectedException, io::IOException, std::exception ) +void SAL_CALL SequenceInputStreamService::closeInput() { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xInputStream.is() ) @@ -152,7 +152,7 @@ void SAL_CALL SequenceInputStreamService::closeInput() throw ( uno::RuntimeExcep } // css::io::XSeekable: -void SAL_CALL SequenceInputStreamService::seek( ::sal_Int64 location ) throw ( uno::RuntimeException, lang::IllegalArgumentException, io::IOException, std::exception ) +void SAL_CALL SequenceInputStreamService::seek( ::sal_Int64 location ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xSeekable.is() ) @@ -161,7 +161,7 @@ void SAL_CALL SequenceInputStreamService::seek( ::sal_Int64 location ) throw ( u m_xSeekable->seek( location ); } -::sal_Int64 SAL_CALL SequenceInputStreamService::getPosition() throw ( uno::RuntimeException, io::IOException, std::exception ) +::sal_Int64 SAL_CALL SequenceInputStreamService::getPosition() { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xSeekable.is() ) @@ -170,7 +170,7 @@ void SAL_CALL SequenceInputStreamService::seek( ::sal_Int64 location ) throw ( u return m_xSeekable->getPosition(); } -::sal_Int64 SAL_CALL SequenceInputStreamService::getLength() throw ( uno::RuntimeException, io::IOException, std::exception ) +::sal_Int64 SAL_CALL SequenceInputStreamService::getLength() { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xSeekable.is() ) @@ -180,7 +180,7 @@ void SAL_CALL SequenceInputStreamService::seek( ::sal_Int64 location ) throw ( u } // css::lang::XInitialization: -void SAL_CALL SequenceInputStreamService::initialize( const uno::Sequence< css::uno::Any > & aArguments ) throw ( uno::RuntimeException, uno::Exception, std::exception ) +void SAL_CALL SequenceInputStreamService::initialize( const uno::Sequence< css::uno::Any > & aArguments ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_bInitialized ) diff --git a/comphelper/source/streaming/seqoutputstreamserv.cxx b/comphelper/source/streaming/seqoutputstreamserv.cxx index 461cbc5d2563..d722ff9c14aa 100644 --- a/comphelper/source/streaming/seqoutputstreamserv.cxx +++ b/comphelper/source/streaming/seqoutputstreamserv.cxx @@ -48,17 +48,17 @@ public: const SequenceOutputStreamService& operator=(const SequenceOutputStreamService&) = delete; // css::lang::XServiceInfo: - virtual OUString SAL_CALL getImplementationName() throw ( uno::RuntimeException, std::exception ) override; - virtual sal_Bool SAL_CALL supportsService( const OUString & ServiceName ) throw ( uno::RuntimeException, std::exception ) override; - virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() throw ( uno::RuntimeException, std::exception ) override; + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString & ServiceName ) override; + virtual uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; // css::io::XOutputStream: - virtual void SAL_CALL writeBytes( const uno::Sequence< ::sal_Int8 > & aData ) throw ( io::NotConnectedException, io::BufferSizeExceededException, io::IOException, uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL flush() throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception ) override; - virtual void SAL_CALL closeOutput() throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception ) override; + virtual void SAL_CALL writeBytes( const uno::Sequence< ::sal_Int8 > & aData ) override; + virtual void SAL_CALL flush() override; + virtual void SAL_CALL closeOutput() override; // css::io::XSequenceOutputStream: - virtual uno::Sequence< ::sal_Int8 > SAL_CALL getWrittenBytes( ) throw ( io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception) override; + virtual uno::Sequence< ::sal_Int8 > SAL_CALL getWrittenBytes( ) override; private: virtual ~SequenceOutputStreamService() override {}; @@ -74,24 +74,24 @@ SequenceOutputStreamService::SequenceOutputStreamService() } // com.sun.star.uno.XServiceInfo: -OUString SAL_CALL SequenceOutputStreamService::getImplementationName() throw ( uno::RuntimeException, std::exception ) +OUString SAL_CALL SequenceOutputStreamService::getImplementationName() { return OUString("com.sun.star.comp.SequenceOutputStreamService"); } -sal_Bool SAL_CALL SequenceOutputStreamService::supportsService( OUString const & serviceName ) throw ( uno::RuntimeException, std::exception ) +sal_Bool SAL_CALL SequenceOutputStreamService::supportsService( OUString const & serviceName ) { return cppu::supportsService(this, serviceName); } -uno::Sequence< OUString > SAL_CALL SequenceOutputStreamService::getSupportedServiceNames() throw ( uno::RuntimeException, std::exception ) +uno::Sequence< OUString > SAL_CALL SequenceOutputStreamService::getSupportedServiceNames() { uno::Sequence s { "com.sun.star.io.SequenceOutputStream" }; return s; } // css::io::XOutputStream: -void SAL_CALL SequenceOutputStreamService::writeBytes( const uno::Sequence< ::sal_Int8 > & aData ) throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception ) +void SAL_CALL SequenceOutputStreamService::writeBytes( const uno::Sequence< ::sal_Int8 > & aData ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xOutputStream.is() ) @@ -101,7 +101,7 @@ void SAL_CALL SequenceOutputStreamService::writeBytes( const uno::Sequence< ::sa m_aSequence = aData; } -void SAL_CALL SequenceOutputStreamService::flush() throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception ) +void SAL_CALL SequenceOutputStreamService::flush() { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xOutputStream.is() ) @@ -110,7 +110,7 @@ void SAL_CALL SequenceOutputStreamService::flush() throw ( uno::RuntimeException m_xOutputStream->flush(); }; -void SAL_CALL SequenceOutputStreamService::closeOutput() throw ( uno::RuntimeException, io::NotConnectedException, io::BufferSizeExceededException, io::IOException, std::exception ) +void SAL_CALL SequenceOutputStreamService::closeOutput() { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xOutputStream.is() ) @@ -121,7 +121,7 @@ void SAL_CALL SequenceOutputStreamService::closeOutput() throw ( uno::RuntimeExc } // css::io::XSequenceOutputStream: -uno::Sequence< ::sal_Int8 > SAL_CALL SequenceOutputStreamService::getWrittenBytes() throw ( io::NotConnectedException, io::IOException, uno::RuntimeException, std::exception) +uno::Sequence< ::sal_Int8 > SAL_CALL SequenceOutputStreamService::getWrittenBytes() { ::osl::MutexGuard aGuard( m_aMutex ); if ( !m_xOutputStream.is() ) diff --git a/comphelper/source/streaming/seqstream.cxx b/comphelper/source/streaming/seqstream.cxx index d4672f602bfe..89625838132a 100644 --- a/comphelper/source/streaming/seqstream.cxx +++ b/comphelper/source/streaming/seqstream.cxx @@ -54,8 +54,6 @@ inline sal_Int32 SequenceInputStream::avail() // css::io::XInputStream sal_Int32 SAL_CALL SequenceInputStream::readBytes( Sequence& aData, sal_Int32 nBytesToRead ) - throw(NotConnectedException, BufferSizeExceededException, - IOException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -76,8 +74,6 @@ sal_Int32 SAL_CALL SequenceInputStream::readBytes( Sequence& aData, sa sal_Int32 SAL_CALL SequenceInputStream::readSomeBytes( Sequence& aData, sal_Int32 nMaxBytesToRead ) - throw(NotConnectedException, BufferSizeExceededException, - IOException, RuntimeException, std::exception) { // all data is available at once return readBytes(aData, nMaxBytesToRead); @@ -85,8 +81,6 @@ sal_Int32 SAL_CALL SequenceInputStream::readSomeBytes( Sequence& aData void SAL_CALL SequenceInputStream::skipBytes( sal_Int32 nBytesToSkip ) - throw(NotConnectedException, BufferSizeExceededException, - IOException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -103,7 +97,6 @@ void SAL_CALL SequenceInputStream::skipBytes( sal_Int32 nBytesToSkip ) sal_Int32 SAL_CALL SequenceInputStream::available( ) - throw(NotConnectedException, IOException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -112,7 +105,6 @@ sal_Int32 SAL_CALL SequenceInputStream::available( ) void SAL_CALL SequenceInputStream::closeInput( ) - throw(NotConnectedException, IOException, RuntimeException, std::exception) { if (m_nPos == -1) throw NotConnectedException(OUString(), *this); @@ -120,19 +112,19 @@ void SAL_CALL SequenceInputStream::closeInput( ) m_nPos = -1; } -void SAL_CALL SequenceInputStream::seek( sal_Int64 location ) throw (IllegalArgumentException, IOException, RuntimeException, std::exception) +void SAL_CALL SequenceInputStream::seek( sal_Int64 location ) { if ( location > m_aData.getLength() || location < 0 || location > SAL_MAX_INT32 ) throw IllegalArgumentException(); m_nPos = (sal_Int32) location; } -sal_Int64 SAL_CALL SequenceInputStream::getPosition() throw (IOException, RuntimeException, std::exception) +sal_Int64 SAL_CALL SequenceInputStream::getPosition() { return m_nPos; } -sal_Int64 SAL_CALL SequenceInputStream::getLength( ) throw (IOException, RuntimeException, std::exception) +sal_Int64 SAL_CALL SequenceInputStream::getLength( ) { return m_aData.getLength(); } @@ -152,7 +144,7 @@ OSequenceOutputStream::OSequenceOutputStream(Sequence< sal_Int8 >& _rSeq, double } -void SAL_CALL OSequenceOutputStream::writeBytes( const Sequence< sal_Int8 >& _rData ) throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) +void SAL_CALL OSequenceOutputStream::writeBytes( const Sequence< sal_Int8 >& _rData ) { MutexGuard aGuard(m_aMutex); if (!m_bConnected) @@ -192,7 +184,7 @@ void SAL_CALL OSequenceOutputStream::writeBytes( const Sequence< sal_Int8 >& _rD } -void SAL_CALL OSequenceOutputStream::flush( ) throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) +void SAL_CALL OSequenceOutputStream::flush( ) { MutexGuard aGuard(m_aMutex); if (!m_bConnected) @@ -203,7 +195,7 @@ void SAL_CALL OSequenceOutputStream::flush( ) throw(NotConnectedException, Buff } -void SAL_CALL OSequenceOutputStream::closeOutput( ) throw(NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) +void SAL_CALL OSequenceOutputStream::closeOutput( ) { MutexGuard aGuard(m_aMutex); if (!m_bConnected) diff --git a/comphelper/source/xml/attributelist.cxx b/comphelper/source/xml/attributelist.cxx index cefede87dfc9..64daa2a14320 100644 --- a/comphelper/source/xml/attributelist.cxx +++ b/comphelper/source/xml/attributelist.cxx @@ -53,17 +53,17 @@ struct AttributeList_Impl ::std::vector vecAttribute; }; -sal_Int16 SAL_CALL AttributeList::getLength() throw( css::uno::RuntimeException, std::exception ) +sal_Int16 SAL_CALL AttributeList::getLength() { return (sal_Int16)(m_pImpl->vecAttribute.size()); } -OUString SAL_CALL AttributeList::getNameByIndex(sal_Int16 i) throw( css::uno::RuntimeException, std::exception ) +OUString SAL_CALL AttributeList::getNameByIndex(sal_Int16 i) { return ( i < static_cast < sal_Int16 > (m_pImpl->vecAttribute.size()) ) ? m_pImpl->vecAttribute[i].sName : OUString(); } -OUString SAL_CALL AttributeList::getTypeByIndex(sal_Int16 i) throw( css::uno::RuntimeException, std::exception ) +OUString SAL_CALL AttributeList::getTypeByIndex(sal_Int16 i) { if( i < static_cast < sal_Int16 > (m_pImpl->vecAttribute.size() ) ) { return m_pImpl->vecAttribute[i].sType; @@ -71,12 +71,12 @@ OUString SAL_CALL AttributeList::getTypeByIndex(sal_Int16 i) throw( css::uno::Ru return OUString(); } -OUString SAL_CALL AttributeList::getValueByIndex(sal_Int16 i) throw( css::uno::RuntimeException, std::exception ) +OUString SAL_CALL AttributeList::getValueByIndex(sal_Int16 i) { return ( i < static_cast < sal_Int16 > (m_pImpl->vecAttribute.size() ) ) ? m_pImpl->vecAttribute[i].sValue : OUString(); } -OUString SAL_CALL AttributeList::getTypeByName( const OUString& sName ) throw( css::uno::RuntimeException, std::exception ) +OUString SAL_CALL AttributeList::getTypeByName( const OUString& sName ) { ::std::vector::iterator ii = m_pImpl->vecAttribute.begin(); @@ -88,7 +88,7 @@ OUString SAL_CALL AttributeList::getTypeByName( const OUString& sName ) throw( c return OUString(); } -OUString SAL_CALL AttributeList::getValueByName(const OUString& sName) throw( css::uno::RuntimeException, std::exception ) +OUString SAL_CALL AttributeList::getValueByName(const OUString& sName) { ::std::vector::iterator ii = m_pImpl->vecAttribute.begin(); @@ -127,7 +127,7 @@ void AttributeList::Clear() m_pImpl->vecAttribute.clear(); } -css::uno::Reference< css::util::XCloneable > AttributeList::createClone() throw (css::uno::RuntimeException, std::exception) +css::uno::Reference< css::util::XCloneable > AttributeList::createClone() { AttributeList *p = new AttributeList( *this ); diff --git a/comphelper/source/xml/ofopxmlhelper.cxx b/comphelper/source/xml/ofopxmlhelper.cxx index eebe3c2e6186..e1633fe3432b 100644 --- a/comphelper/source/xml/ofopxmlhelper.cxx +++ b/comphelper/source/xml/ofopxmlhelper.cxx @@ -72,14 +72,14 @@ public: explicit OFOPXMLHelper_Impl( sal_uInt16 nFormat ); // must not be created directly // XDocumentHandler - virtual void SAL_CALL startDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL endDocument() throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL startElement( const OUString& aName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL endElement( const OUString& aName ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL characters( const OUString& aChars ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) throw (css::xml::sax::SAXException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL startDocument() override; + virtual void SAL_CALL endDocument() override; + virtual void SAL_CALL startElement( const OUString& aName, const css::uno::Reference< css::xml::sax::XAttributeList >& xAttribs ) override; + virtual void SAL_CALL endElement( const OUString& aName ) override; + virtual void SAL_CALL characters( const OUString& aChars ) override; + virtual void SAL_CALL ignorableWhitespace( const OUString& aWhitespaces ) override; + virtual void SAL_CALL processingInstruction( const OUString& aTarget, const OUString& aData ) override; + virtual void SAL_CALL setDocumentLocator( const css::uno::Reference< css::xml::sax::XLocator >& xLocator ) override; }; @@ -89,14 +89,12 @@ namespace OFOPXMLHelper { static uno::Sequence> ReadSequence_Impl( const uno::Reference& xInStream, const OUString& aStringID, sal_uInt16 nFormat, - const uno::Reference& xContext) -throw (uno::Exception); + const uno::Reference& xContext); uno::Sequence< uno::Sequence< beans::StringPair > > ReadRelationsInfoSequence( const uno::Reference< io::XInputStream >& xInStream, const OUString & aStreamName, const uno::Reference< uno::XComponentContext >& rContext ) - throw( uno::Exception ) { OUString aStringID = "_rels/" + aStreamName; return ReadSequence_Impl( xInStream, aStringID, RELATIONINFO_FORMAT, rContext ); @@ -106,7 +104,6 @@ uno::Sequence< uno::Sequence< beans::StringPair > > ReadRelationsInfoSequence( uno::Sequence< uno::Sequence< beans::StringPair > > ReadContentTypeSequence( const uno::Reference< io::XInputStream >& xInStream, const uno::Reference< uno::XComponentContext >& rContext ) - throw( uno::Exception ) { OUString aStringID = "[Content_Types].xml"; return ReadSequence_Impl( xInStream, aStringID, CONTENTTYPE_FORMAT, rContext ); @@ -117,7 +114,6 @@ void WriteRelationsInfoSequence( const uno::Reference< io::XOutputStream >& xOutStream, const uno::Sequence< uno::Sequence< beans::StringPair > >& aSequence, const uno::Reference< uno::XComponentContext >& rContext ) - throw( uno::Exception ) { if ( !xOutStream.is() ) throw uno::RuntimeException(); @@ -178,7 +174,6 @@ void WriteContentSequence( const uno::Sequence< beans::StringPair >& aDefaultsSequence, const uno::Sequence< beans::StringPair >& aOverridesSequence, const uno::Reference< uno::XComponentContext >& rContext ) - throw( uno::Exception ) { if ( !xOutStream.is() ) throw uno::RuntimeException(); @@ -239,7 +234,6 @@ uno::Sequence< uno::Sequence< beans::StringPair > > ReadSequence_Impl( const uno::Reference< io::XInputStream >& xInStream, const OUString& aStringID, sal_uInt16 nFormat, const uno::Reference< uno::XComponentContext >& rContext ) - throw( uno::Exception ) { if ( !rContext.is() || !xInStream.is() || nFormat > FORMAT_MAX_ID ) throw uno::RuntimeException(); @@ -287,19 +281,16 @@ uno::Sequence< uno::Sequence< beans::StringPair > > const & OFOPXMLHelper_Impl:: void SAL_CALL OFOPXMLHelper_Impl::startDocument() - throw(css::xml::sax::SAXException, uno::RuntimeException, std::exception) { } void SAL_CALL OFOPXMLHelper_Impl::endDocument() - throw(css::xml::sax::SAXException, uno::RuntimeException, std::exception) { } void SAL_CALL OFOPXMLHelper_Impl::startElement( const OUString& aName, const uno::Reference< css::xml::sax::XAttributeList >& xAttribs ) - throw( css::xml::sax::SAXException, uno::RuntimeException, std::exception ) { if ( m_nFormat == RELATIONINFO_FORMAT ) { @@ -442,7 +433,6 @@ void SAL_CALL OFOPXMLHelper_Impl::startElement( const OUString& aName, const uno void SAL_CALL OFOPXMLHelper_Impl::endElement( const OUString& aName ) - throw( css::xml::sax::SAXException, uno::RuntimeException, std::exception ) { if ( m_nFormat == RELATIONINFO_FORMAT || m_nFormat == CONTENTTYPE_FORMAT ) { @@ -459,25 +449,21 @@ void SAL_CALL OFOPXMLHelper_Impl::endElement( const OUString& aName ) void SAL_CALL OFOPXMLHelper_Impl::characters( const OUString& /*aChars*/ ) - throw(css::xml::sax::SAXException, uno::RuntimeException, std::exception) { } void SAL_CALL OFOPXMLHelper_Impl::ignorableWhitespace( const OUString& /*aWhitespaces*/ ) - throw(css::xml::sax::SAXException, uno::RuntimeException, std::exception) { } void SAL_CALL OFOPXMLHelper_Impl::processingInstruction( const OUString& /*aTarget*/, const OUString& /*aData*/ ) - throw(css::xml::sax::SAXException, uno::RuntimeException, std::exception) { } void SAL_CALL OFOPXMLHelper_Impl::setDocumentLocator( const uno::Reference< css::xml::sax::XLocator >& /*xLocator*/ ) - throw(css::xml::sax::SAXException, uno::RuntimeException, std::exception) { } diff --git a/configmgr/qa/unit/test.cxx b/configmgr/qa/unit/test.cxx index d0fc33260225..cd4614aa4f8f 100644 --- a/configmgr/qa/unit/test.cxx +++ b/configmgr/qa/unit/test.cxx @@ -130,12 +130,10 @@ protected: Test const & test_; private: - virtual void SAL_CALL disposing(css::lang::EventObject const &) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing(css::lang::EventObject const &) override; virtual void SAL_CALL propertyChange( - css::beans::PropertyChangeEvent const &) - throw (css::uno::RuntimeException, std::exception) override; + css::beans::PropertyChangeEvent const &) override; int count_; bool * destroyed_; @@ -167,14 +165,12 @@ RecursiveTest::~RecursiveTest() } void RecursiveTest::disposing(css::lang::EventObject const & Source) - throw (css::uno::RuntimeException, std::exception) { CPPUNIT_ASSERT(properties_.is() && Source.Source == properties_); properties_.clear(); } void RecursiveTest::propertyChange(css::beans::PropertyChangeEvent const & evt) - throw (css::uno::RuntimeException, std::exception) { CPPUNIT_ASSERT( evt.Source == properties_ && evt.PropertyName == "Label" ); if (count_ > 0) { diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx index 486a826e50e4..63ec79f04157 100644 --- a/configmgr/source/access.cxx +++ b/configmgr/source/access.cxx @@ -173,7 +173,6 @@ void Access::initBroadcaster( } css::uno::Sequence< css::uno::Type > Access::getTypes() - throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -225,7 +224,6 @@ css::uno::Sequence< css::uno::Type > Access::getTypes() } css::uno::Sequence< sal_Int8 > Access::getImplementationId() - throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -233,7 +231,7 @@ css::uno::Sequence< sal_Int8 > Access::getImplementationId() return css::uno::Sequence< sal_Int8 >(); } -OUString Access::getImplementationName() throw (css::uno::RuntimeException, std::exception) +OUString Access::getImplementationName() { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -242,13 +240,11 @@ OUString Access::getImplementationName() throw (css::uno::RuntimeException, std: } sal_Bool Access::supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, ServiceName); } css::uno::Sequence< OUString > Access::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -279,7 +275,7 @@ css::uno::Sequence< OUString > Access::getSupportedServiceNames() return comphelper::containerToSequence(services); } -void Access::dispose() throw (css::uno::RuntimeException, std::exception) { +void Access::dispose() { assert(thisIs(IS_ANY)); Broadcaster bc; { @@ -302,7 +298,6 @@ void Access::dispose() throw (css::uno::RuntimeException, std::exception) { void Access::addEventListener( css::uno::Reference< css::lang::XEventListener > const & xListener) - throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); { @@ -325,7 +320,6 @@ void Access::addEventListener( void Access::removeEventListener( css::uno::Reference< css::lang::XEventListener > const & aListener) - throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -336,7 +330,7 @@ void Access::removeEventListener( } } -css::uno::Type Access::getElementType() throw (css::uno::RuntimeException, std::exception) { +css::uno::Type Access::getElementType() { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); checkLocalizedPropertyAccess(); @@ -359,7 +353,7 @@ css::uno::Type Access::getElementType() throw (css::uno::RuntimeException, std:: } } -sal_Bool Access::hasElements() throw (css::uno::RuntimeException, std::exception) { +sal_Bool Access::hasElements() { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); checkLocalizedPropertyAccess(); @@ -403,9 +397,6 @@ bool Access::getByNameFast(const OUString & name, css::uno::Any & value) } css::uno::Any Access::getByName(OUString const & aName) - throw ( - css::container::NoSuchElementException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -418,7 +409,6 @@ css::uno::Any Access::getByName(OUString const & aName) } css::uno::Sequence< OUString > Access::getElementNames() - throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -435,7 +425,6 @@ css::uno::Sequence< OUString > Access::getElementNames() } sal_Bool Access::hasByName(OUString const & aName) - throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -444,7 +433,6 @@ sal_Bool Access::hasByName(OUString const & aName) } css::uno::Any Access::getByHierarchicalName(OUString const & aName) - throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -458,7 +446,6 @@ css::uno::Any Access::getByHierarchicalName(OUString const & aName) } sal_Bool Access::hasByHierarchicalName(OUString const & aName) - throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -468,10 +455,6 @@ sal_Bool Access::hasByHierarchicalName(OUString const & aName) void Access::replaceByHierarchicalName( OUString const & aName, css::uno::Any const & aElement) - throw ( - css::lang::IllegalArgumentException, - css::container::NoSuchElementException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { //TODO: Actually support sets and combine with replaceByName: assert(thisIs(IS_UPDATE)); @@ -514,7 +497,6 @@ void Access::replaceByHierarchicalName( void Access::addContainerListener( css::uno::Reference< css::container::XContainerListener > const & xListener) - throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); { @@ -537,7 +519,6 @@ void Access::addContainerListener( void Access::removeContainerListener( css::uno::Reference< css::container::XContainerListener > const & xListener) - throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -549,7 +530,6 @@ void Access::removeContainerListener( } OUString Access::getExactName(OUString const & aApproximateName) - throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -558,7 +538,6 @@ OUString Access::getExactName(OUString const & aApproximateName) } css::uno::Sequence< css::beans::Property > Access::getProperties() - throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); osl::MutexGuard g(*lock_); @@ -574,7 +553,6 @@ css::uno::Sequence< css::beans::Property > Access::getProperties() } css::beans::Property Access::getPropertyByName(OUString const & aName) - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); osl::MutexGuard g(*lock_); @@ -587,14 +565,13 @@ css::beans::Property Access::getPropertyByName(OUString const & aName) } sal_Bool Access::hasPropertyByName(OUString const & Name) - throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); osl::MutexGuard g(*lock_); return getChild(Name).is(); } -OUString Access::getHierarchicalName() throw (css::uno::RuntimeException, std::exception) { +OUString Access::getHierarchicalName() { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); checkLocalizedPropertyAccess(); @@ -616,9 +593,6 @@ OUString Access::getHierarchicalName() throw (css::uno::RuntimeException, std::e OUString Access::composeHierarchicalName( OUString const & aRelativeName) - throw ( - css::lang::IllegalArgumentException, css::lang::NoSupportException, - css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -636,7 +610,7 @@ OUString Access::composeHierarchicalName( return path.makeStringAndClear(); } -OUString Access::getName() throw (css::uno::RuntimeException, std::exception) { +OUString Access::getName() { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); checkLocalizedPropertyAccess(); @@ -644,7 +618,6 @@ OUString Access::getName() throw (css::uno::RuntimeException, std::exception) { } void Access::setName(OUString const & aName) - throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); Broadcaster bc; @@ -712,7 +685,7 @@ void Access::setName(OUString const & aName) bc.send(); } -css::beans::Property Access::getAsProperty() throw (css::uno::RuntimeException, std::exception) +css::beans::Property Access::getAsProperty() { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -721,7 +694,6 @@ css::beans::Property Access::getAsProperty() throw (css::uno::RuntimeException, } css::uno::Reference< css::beans::XPropertySetInfo > Access::getPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); return this; @@ -729,10 +701,6 @@ css::uno::Reference< css::beans::XPropertySetInfo > Access::getPropertySetInfo() void Access::setPropertyValue( OUString const & aPropertyName, css::uno::Any const & aValue) - throw ( - css::beans::UnknownPropertyException, css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); Broadcaster bc; @@ -754,9 +722,6 @@ void Access::setPropertyValue( } css::uno::Any Access::getPropertyValue(OUString const & PropertyName) - throw ( - css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); osl::MutexGuard g(*lock_); @@ -772,9 +737,6 @@ void Access::addPropertyChangeListener( OUString const & aPropertyName, css::uno::Reference< css::beans::XPropertyChangeListener > const & xListener) - throw ( - css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); { @@ -799,9 +761,6 @@ void Access::removePropertyChangeListener( OUString const & aPropertyName, css::uno::Reference< css::beans::XPropertyChangeListener > const & aListener) - throw ( - css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); osl::MutexGuard g(*lock_); @@ -823,9 +782,6 @@ void Access::addVetoableChangeListener( OUString const & PropertyName, css::uno::Reference< css::beans::XVetoableChangeListener > const & aListener) - throw ( - css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); { @@ -851,9 +807,6 @@ void Access::removeVetoableChangeListener( OUString const & PropertyName, css::uno::Reference< css::beans::XVetoableChangeListener > const & aListener) - throw ( - css::beans::UnknownPropertyException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); osl::MutexGuard g(*lock_); @@ -874,9 +827,6 @@ void Access::removeVetoableChangeListener( void Access::setPropertyValues( css::uno::Sequence< OUString > const & aPropertyNames, css::uno::Sequence< css::uno::Any > const & aValues) - throw ( - css::beans::PropertyVetoException, css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); Broadcaster bc; @@ -908,7 +858,6 @@ void Access::setPropertyValues( css::uno::Sequence< css::uno::Any > Access::getPropertyValues( css::uno::Sequence< OUString > const & aPropertyNames) - throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); osl::MutexGuard g(*lock_); @@ -929,7 +878,6 @@ void Access::addPropertiesChangeListener( css::uno::Sequence< OUString > const &, css::uno::Reference< css::beans::XPropertiesChangeListener > const & xListener) - throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); { @@ -952,7 +900,6 @@ void Access::addPropertiesChangeListener( void Access::removePropertiesChangeListener( css::uno::Reference< css::beans::XPropertiesChangeListener > const & xListener) - throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); osl::MutexGuard g(*lock_); @@ -967,7 +914,6 @@ void Access::firePropertiesChangeEvent( css::uno::Sequence< OUString > const & aPropertyNames, css::uno::Reference< css::beans::XPropertiesChangeListener > const & xListener) - throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); css::uno::Sequence< css::beans::PropertyChangeEvent > events( @@ -982,7 +928,7 @@ void Access::firePropertiesChangeEvent( } css::uno::Reference< css::beans::XHierarchicalPropertySetInfo > -Access::getHierarchicalPropertySetInfo() throw (css::uno::RuntimeException, std::exception) { +Access::getHierarchicalPropertySetInfo() { assert(thisIs(IS_GROUP)); return this; } @@ -990,10 +936,6 @@ Access::getHierarchicalPropertySetInfo() throw (css::uno::RuntimeException, std: void Access::setHierarchicalPropertyValue( OUString const & aHierarchicalPropertyName, css::uno::Any const & aValue) - throw ( - css::beans::UnknownPropertyException, css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); Broadcaster bc; @@ -1021,10 +963,6 @@ void Access::setHierarchicalPropertyValue( css::uno::Any Access::getHierarchicalPropertyValue( OUString const & aHierarchicalPropertyName) - throw ( - css::beans::UnknownPropertyException, - css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); osl::MutexGuard g(*lock_); @@ -1040,9 +978,6 @@ css::uno::Any Access::getHierarchicalPropertyValue( void Access::setHierarchicalPropertyValues( css::uno::Sequence< OUString > const & aHierarchicalPropertyNames, css::uno::Sequence< css::uno::Any > const & Values) - throw ( - css::beans::PropertyVetoException, css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); Broadcaster bc; @@ -1079,9 +1014,6 @@ void Access::setHierarchicalPropertyValues( css::uno::Sequence< css::uno::Any > Access::getHierarchicalPropertyValues( css::uno::Sequence< OUString > const & aHierarchicalPropertyNames) - throw ( - css::lang::IllegalArgumentException, css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); osl::MutexGuard g(*lock_); @@ -1103,7 +1035,6 @@ css::uno::Sequence< css::uno::Any > Access::getHierarchicalPropertyValues( css::beans::Property Access::getPropertyByHierarchicalName( OUString const & aHierarchicalName) - throw (css::beans::UnknownPropertyException, css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); osl::MutexGuard g(*lock_); @@ -1117,7 +1048,6 @@ css::beans::Property Access::getPropertyByHierarchicalName( sal_Bool Access::hasPropertyByHierarchicalName( OUString const & aHierarchicalName) - throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_GROUP)); osl::MutexGuard g(*lock_); @@ -1126,10 +1056,6 @@ sal_Bool Access::hasPropertyByHierarchicalName( void Access::replaceByName( OUString const & aName, css::uno::Any const & aElement) - throw ( - css::lang::IllegalArgumentException, - css::container::NoSuchElementException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { assert(thisIs(IS_UPDATE)); Broadcaster bc; @@ -1170,10 +1096,6 @@ void Access::replaceByName( void Access::insertByName( OUString const & aName, css::uno::Any const & aElement) - throw ( - css::lang::IllegalArgumentException, - css::container::ElementExistException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { assert(thisIs(IS_EXTENSIBLE|IS_UPDATE)); Broadcaster bc; @@ -1233,9 +1155,6 @@ void Access::insertByName( } void Access::removeByName(OUString const & aName) - throw ( - css::container::NoSuchElementException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) { assert(thisIs(IS_EXTENSIBLE|IS_UPDATE)); Broadcaster bc; @@ -1270,7 +1189,6 @@ void Access::removeByName(OUString const & aName) } css::uno::Reference< css::uno::XInterface > Access::createInstance() - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { assert(thisIs(IS_SET|IS_UPDATE)); OUString tmplName( @@ -1290,7 +1208,6 @@ css::uno::Reference< css::uno::XInterface > Access::createInstance() css::uno::Reference< css::uno::XInterface > Access::createInstanceWithArguments( css::uno::Sequence< css::uno::Any > const & aArguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { assert(thisIs(IS_SET|IS_UPDATE)); if (aArguments.getLength() != 0) { @@ -1386,7 +1303,6 @@ void Access::clearListeners() throw() { } css::uno::Any Access::queryInterface(css::uno::Type const & aType) - throw (css::uno::RuntimeException, std::exception) { css::uno::Any res(OWeakObject::queryInterface(aType)); if (res.hasValue()) { diff --git a/configmgr/source/access.hxx b/configmgr/source/access.hxx index 5bd3a74f89c3..5fc8d183f5be 100644 --- a/configmgr/source/access.hxx +++ b/configmgr/source/access.hxx @@ -134,295 +134,179 @@ public: using OWeakObject::release; virtual css::uno::Sequence< css::uno::Type > SAL_CALL - getTypes() throw (css::uno::RuntimeException, std::exception) override; + getTypes() override; virtual css::uno::Sequence< sal_Int8 > SAL_CALL - getImplementationId() throw (css::uno::RuntimeException, std::exception) override; + getImplementationId() override; - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; - virtual void SAL_CALL dispose() - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL dispose() override; virtual void SAL_CALL addEventListener( css::uno::Reference< css::lang::XEventListener > - const & xListener) - throw (css::uno::RuntimeException, std::exception) override; + const & xListener) override; virtual void SAL_CALL removeEventListener( css::uno::Reference< css::lang::XEventListener > - const & aListener) - throw (css::uno::RuntimeException, std::exception) override; + const & aListener) override; - virtual css::uno::Type SAL_CALL getElementType() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Type SAL_CALL getElementType() override; - virtual sal_Bool SAL_CALL hasElements() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasElements() override; virtual css::uno::Any SAL_CALL getByName( - OUString const & aName) - throw ( - css::container::NoSuchElementException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + OUString const & aName) override; virtual css::uno::Sequence< OUString > SAL_CALL - getElementNames() throw (css::uno::RuntimeException, std::exception) override; + getElementNames() override; - virtual sal_Bool SAL_CALL hasByName(OUString const & aName) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasByName(OUString const & aName) override; virtual css::uno::Any SAL_CALL getByHierarchicalName( - OUString const & aName) - throw ( - css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; + OUString const & aName) override; - virtual sal_Bool SAL_CALL hasByHierarchicalName(OUString const & aName) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasByHierarchicalName(OUString const & aName) override; virtual void SAL_CALL replaceByHierarchicalName( - OUString const & aName, css::uno::Any const & aElement) - throw ( - css::lang::IllegalArgumentException, - css::container::NoSuchElementException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + OUString const & aName, css::uno::Any const & aElement) override; virtual void SAL_CALL addContainerListener( css::uno::Reference< - css::container::XContainerListener > const & xListener) - throw (css::uno::RuntimeException, std::exception) override; + css::container::XContainerListener > const & xListener) override; virtual void SAL_CALL removeContainerListener( css::uno::Reference< - css::container::XContainerListener > const & xListener) - throw (css::uno::RuntimeException, std::exception) override; + css::container::XContainerListener > const & xListener) override; virtual OUString SAL_CALL getExactName( - OUString const & aApproximateName) - throw (css::uno::RuntimeException, std::exception) override; + OUString const & aApproximateName) override; virtual css::uno::Sequence< css::beans::Property > - SAL_CALL getProperties() throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getProperties() override; virtual css::beans::Property SAL_CALL getPropertyByName( - OUString const & aName) - throw ( - css::beans::UnknownPropertyException, - css::uno::RuntimeException, std::exception) override; + OUString const & aName) override; - virtual sal_Bool SAL_CALL hasPropertyByName(OUString const & Name) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasPropertyByName(OUString const & Name) override; - virtual OUString SAL_CALL getHierarchicalName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getHierarchicalName() override; virtual OUString SAL_CALL composeHierarchicalName( - OUString const & aRelativeName) - throw ( - css::lang::IllegalArgumentException, - css::lang::NoSupportException, - css::uno::RuntimeException, std::exception) override; + OUString const & aRelativeName) override; - virtual OUString SAL_CALL getName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getName() override; - virtual void SAL_CALL setName(OUString const & aName) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setName(OUString const & aName) override; - virtual css::beans::Property SAL_CALL getAsProperty() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::beans::Property SAL_CALL getAsProperty() override; virtual css::uno::Reference< css::beans::XPropertySetInfo > - SAL_CALL getPropertySetInfo() throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getPropertySetInfo() override; virtual void SAL_CALL setPropertyValue( OUString const & aPropertyName, - css::uno::Any const & aValue) - throw ( - css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + css::uno::Any const & aValue) override; virtual css::uno::Any SAL_CALL getPropertyValue( - OUString const & PropertyName) - throw ( - css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + OUString const & PropertyName) override; virtual void SAL_CALL addPropertyChangeListener( OUString const & aPropertyName, css::uno::Reference< - css::beans::XPropertyChangeListener > const & xListener) - throw ( - css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + css::beans::XPropertyChangeListener > const & xListener) override; virtual void SAL_CALL removePropertyChangeListener( OUString const & aPropertyName, css::uno::Reference< - css::beans::XPropertyChangeListener > const & aListener) - throw ( - css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + css::beans::XPropertyChangeListener > const & aListener) override; virtual void SAL_CALL addVetoableChangeListener( OUString const & PropertyName, css::uno::Reference< - css::beans::XVetoableChangeListener > const & aListener) - throw ( - css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + css::beans::XVetoableChangeListener > const & aListener) override; virtual void SAL_CALL removeVetoableChangeListener( OUString const & PropertyName, css::uno::Reference< - css::beans::XVetoableChangeListener > const & aListener) - throw ( - css::beans::UnknownPropertyException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + css::beans::XVetoableChangeListener > const & aListener) override; virtual void SAL_CALL setPropertyValues( css::uno::Sequence< OUString > const & aPropertyNames, css::uno::Sequence< css::uno::Any > const & - aValues) - throw ( - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + aValues) override; virtual css::uno::Sequence< css::uno::Any > SAL_CALL getPropertyValues( - css::uno::Sequence< OUString > const & aPropertyNames) - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< OUString > const & aPropertyNames) override; virtual void SAL_CALL addPropertiesChangeListener( css::uno::Sequence< OUString > const & aPropertyNames, css::uno::Reference< css::beans::XPropertiesChangeListener > const & - xListener) - throw (css::uno::RuntimeException, std::exception) override; + xListener) override; virtual void SAL_CALL removePropertiesChangeListener( css::uno::Reference< css::beans::XPropertiesChangeListener > const & - xListener) - throw (css::uno::RuntimeException, std::exception) override; + xListener) override; virtual void SAL_CALL firePropertiesChangeEvent( css::uno::Sequence< OUString > const & aPropertyNames, css::uno::Reference< css::beans::XPropertiesChangeListener > const & - xListener) - throw (css::uno::RuntimeException, std::exception) override; + xListener) override; virtual css::uno::Reference< css::beans::XHierarchicalPropertySetInfo > SAL_CALL - getHierarchicalPropertySetInfo() - throw (css::uno::RuntimeException, std::exception) override; + getHierarchicalPropertySetInfo() override; virtual void SAL_CALL setHierarchicalPropertyValue( OUString const & aHierarchicalPropertyName, - css::uno::Any const & aValue) - throw ( - css::beans::UnknownPropertyException, - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + css::uno::Any const & aValue) override; virtual css::uno::Any SAL_CALL getHierarchicalPropertyValue( - OUString const & aHierarchicalPropertyName) - throw ( - css::beans::UnknownPropertyException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + OUString const & aHierarchicalPropertyName) override; virtual void SAL_CALL setHierarchicalPropertyValues( css::uno::Sequence< OUString > const & aHierarchicalPropertyNames, css::uno::Sequence< css::uno::Any > const & - Values) - throw ( - css::beans::PropertyVetoException, - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + Values) override; virtual css::uno::Sequence< css::uno::Any > SAL_CALL getHierarchicalPropertyValues( css::uno::Sequence< OUString > const & - aHierarchicalPropertyNames) - throw ( - css::lang::IllegalArgumentException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + aHierarchicalPropertyNames) override; virtual css::beans::Property SAL_CALL - getPropertyByHierarchicalName(OUString const & aHierarchicalName) - throw ( - css::beans::UnknownPropertyException, - css::uno::RuntimeException, std::exception) override; + getPropertyByHierarchicalName(OUString const & aHierarchicalName) override; virtual sal_Bool SAL_CALL hasPropertyByHierarchicalName( - OUString const & aHierarchicalName) - throw (css::uno::RuntimeException, std::exception) override; + OUString const & aHierarchicalName) override; virtual void SAL_CALL replaceByName( - OUString const & aName, css::uno::Any const & aElement) - throw ( - css::lang::IllegalArgumentException, - css::container::NoSuchElementException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + OUString const & aName, css::uno::Any const & aElement) override; virtual void SAL_CALL insertByName( - OUString const & aName, css::uno::Any const & aElement) - throw ( - css::lang::IllegalArgumentException, - css::container::ElementExistException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; - - virtual void SAL_CALL removeByName(OUString const & aName) - throw ( - css::container::NoSuchElementException, - css::lang::WrappedTargetException, - css::uno::RuntimeException, std::exception) override; + OUString const & aName, css::uno::Any const & aElement) override; + + virtual void SAL_CALL removeByName(OUString const & aName) override; virtual css::uno::Reference< css::uno::XInterface > - SAL_CALL createInstance() - throw ( - css::uno::Exception, - css::uno::RuntimeException, std::exception) override; + SAL_CALL createInstance() override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( css::uno::Sequence< css::uno::Any > const & - aArguments) - throw ( - css::uno::Exception, - css::uno::RuntimeException, std::exception) override; + aArguments) override; protected: explicit Access(Components & components); @@ -443,8 +327,7 @@ protected: virtual void clearListeners() throw (); virtual css::uno::Any SAL_CALL queryInterface( - css::uno::Type const & aType) - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Type const & aType) override; Components & getComponents() const { return components_;} diff --git a/configmgr/source/childaccess.cxx b/configmgr/source/childaccess.cxx index 2cde81159b4a..c38e58a4cd43 100644 --- a/configmgr/source/childaccess.cxx +++ b/configmgr/source/childaccess.cxx @@ -151,7 +151,6 @@ void ChildAccess::release() throw () { } css::uno::Reference< css::uno::XInterface > ChildAccess::getParent() - throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -160,7 +159,6 @@ css::uno::Reference< css::uno::XInterface > ChildAccess::getParent() } void ChildAccess::setParent(css::uno::Reference< css::uno::XInterface > const &) - throw (css::lang::NoSupportException, css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -171,7 +169,6 @@ void ChildAccess::setParent(css::uno::Reference< css::uno::XInterface > const &) sal_Int64 ChildAccess::getSomething( css::uno::Sequence< sal_Int8 > const & aIdentifier) - throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -344,7 +341,6 @@ void ChildAccess::addSupportedServiceNames( } css::uno::Any ChildAccess::queryInterface(css::uno::Type const & aType) - throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); diff --git a/configmgr/source/childaccess.hxx b/configmgr/source/childaccess.hxx index dd81b251bb8b..5a0ab480ec0d 100644 --- a/configmgr/source/childaccess.hxx +++ b/configmgr/source/childaccess.hxx @@ -82,18 +82,13 @@ public: virtual void SAL_CALL release() throw () override; virtual css::uno::Reference< css::uno::XInterface > - SAL_CALL getParent() - throw (css::uno::RuntimeException, std::exception) override; + SAL_CALL getParent() override; virtual void SAL_CALL setParent( - css::uno::Reference< css::uno::XInterface > const &) - throw ( - css::lang::NoSupportException, - css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::uno::XInterface > const &) override; virtual sal_Int64 SAL_CALL getSomething( - css::uno::Sequence< sal_Int8 > const & aIdentifier) - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int8 > const & aIdentifier) override; void bind( rtl::Reference< RootAccess > const & root, @@ -127,8 +122,7 @@ private: std::vector * services) override; virtual css::uno::Any SAL_CALL queryInterface( - css::uno::Type const & aType) - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Type const & aType) override; rtl::Reference< RootAccess > root_; rtl::Reference< Access > parent_; // null if free node diff --git a/configmgr/source/configurationprovider.cxx b/configmgr/source/configurationprovider.cxx index e4454a4c02a3..f093e9f684bc 100644 --- a/configmgr/source/configurationprovider.cxx +++ b/configmgr/source/configurationprovider.cxx @@ -117,20 +117,18 @@ private: virtual void SAL_CALL disposing() override { flushModifications(); } - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getImplementationName() override { return default_ ? default_provider::getImplementationName() : configuration_provider::getImplementationName(); } - virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override + getSupportedServiceNames() override { return default_ ? default_provider::getSupportedServiceNames() @@ -138,43 +136,35 @@ private: } virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstance( - OUString const & aServiceSpecifier) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + OUString const & aServiceSpecifier) override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArguments( OUString const & ServiceSpecifier, - css::uno::Sequence< css::uno::Any > const & Arguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< css::uno::Any > const & Arguments) override; virtual css::uno::Sequence< OUString > SAL_CALL - getAvailableServiceNames() throw (css::uno::RuntimeException, std::exception) override; + getAvailableServiceNames() override; - virtual void SAL_CALL refresh() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL refresh() override; virtual void SAL_CALL addRefreshListener( - css::uno::Reference< css::util::XRefreshListener > const & l) - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::util::XRefreshListener > const & l) override; virtual void SAL_CALL removeRefreshListener( - css::uno::Reference< css::util::XRefreshListener > const & l) - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::util::XRefreshListener > const & l) override; - virtual void SAL_CALL flush() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL flush() override; virtual void SAL_CALL addFlushListener( - css::uno::Reference< css::util::XFlushListener > const & l) - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::util::XFlushListener > const & l) override; virtual void SAL_CALL removeFlushListener( - css::uno::Reference< css::util::XFlushListener > const & l) - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::util::XFlushListener > const & l) override; - virtual void SAL_CALL setLocale(css::lang::Locale const & eLocale) - throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setLocale(css::lang::Locale const & eLocale) override; - virtual css::lang::Locale SAL_CALL getLocale() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::lang::Locale SAL_CALL getLocale() override; void flushModifications() const; @@ -186,7 +176,6 @@ private: css::uno::Reference< css::uno::XInterface > Service::createInstance( OUString const & aServiceSpecifier) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { return createInstanceWithArguments( aServiceSpecifier, css::uno::Sequence< css::uno::Any >()); @@ -196,7 +185,6 @@ css::uno::Reference< css::uno::XInterface > Service::createInstanceWithArguments( OUString const & ServiceSpecifier, css::uno::Sequence< css::uno::Any > const & Arguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { OUString nodepath; OUString locale; @@ -284,7 +272,6 @@ Service::createInstanceWithArguments( } css::uno::Sequence< OUString > Service::getAvailableServiceNames() - throw (css::uno::RuntimeException, std::exception) { css::uno::Sequence< OUString > names(2); names[0] = accessServiceName; @@ -292,7 +279,7 @@ css::uno::Sequence< OUString > Service::getAvailableServiceNames() return names; } -void Service::refresh() throw (css::uno::RuntimeException, std::exception) { +void Service::refresh() { //TODO cppu::OInterfaceContainerHelper * cont = rBHelper.getContainer( cppu::UnoType< css::util::XRefreshListener >::get()); @@ -304,7 +291,6 @@ void Service::refresh() throw (css::uno::RuntimeException, std::exception) { void Service::addRefreshListener( css::uno::Reference< css::util::XRefreshListener > const & l) - throw (css::uno::RuntimeException, std::exception) { rBHelper.addListener( cppu::UnoType< css::util::XRefreshListener >::get(), l); @@ -312,13 +298,12 @@ void Service::addRefreshListener( void Service::removeRefreshListener( css::uno::Reference< css::util::XRefreshListener > const & l) - throw (css::uno::RuntimeException, std::exception) { rBHelper.removeListener( cppu::UnoType< css::util::XRefreshListener >::get(), l); } -void Service::flush() throw (css::uno::RuntimeException, std::exception) { +void Service::flush() { flushModifications(); cppu::OInterfaceContainerHelper * cont = rBHelper.getContainer( cppu::UnoType< css::util::XFlushListener >::get()); @@ -330,27 +315,24 @@ void Service::flush() throw (css::uno::RuntimeException, std::exception) { void Service::addFlushListener( css::uno::Reference< css::util::XFlushListener > const & l) - throw (css::uno::RuntimeException, std::exception) { rBHelper.addListener(cppu::UnoType< css::util::XFlushListener >::get(), l); } void Service::removeFlushListener( css::uno::Reference< css::util::XFlushListener > const & l) - throw (css::uno::RuntimeException, std::exception) { rBHelper.removeListener( cppu::UnoType< css::util::XFlushListener >::get(), l); } void Service::setLocale(css::lang::Locale const & eLocale) - throw (css::uno::RuntimeException, std::exception) { osl::MutexGuard guard(*lock_); locale_ = LanguageTag::convertToBcp47( eLocale, false); } -css::lang::Locale Service::getLocale() throw (css::uno::RuntimeException, std::exception) { +css::lang::Locale Service::getLocale() { osl::MutexGuard guard(*lock_); css::lang::Locale loc; if (! locale_.isEmpty()) { @@ -383,31 +365,26 @@ private: virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithContext( - css::uno::Reference< css::uno::XComponentContext > const & Context) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::uno::XComponentContext > const & Context) override; virtual css::uno::Reference< css::uno::XInterface > SAL_CALL createInstanceWithArgumentsAndContext( css::uno::Sequence< css::uno::Any > const & Arguments, - css::uno::Reference< css::uno::XComponentContext > const & Context) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::uno::XComponentContext > const & Context) override; - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getImplementationName() override { return configuration_provider::getImplementationName(); } - virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override + getSupportedServiceNames() override { return configuration_provider::getSupportedServiceNames(); } }; css::uno::Reference< css::uno::XInterface > Factory::createInstanceWithContext( css::uno::Reference< css::uno::XComponentContext > const & Context) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { return createInstanceWithArgumentsAndContext( css::uno::Sequence< css::uno::Any >(), Context); @@ -417,7 +394,6 @@ css::uno::Reference< css::uno::XInterface > Factory::createInstanceWithArgumentsAndContext( css::uno::Sequence< css::uno::Any > const & Arguments, css::uno::Reference< css::uno::XComponentContext > const & Context) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { if (Arguments.getLength() == 0) { return css::configuration::theDefaultProvider::get(Context); diff --git a/configmgr/source/configurationregistry.cxx b/configmgr/source/configurationregistry.cxx index 5370f036cde5..2f23577ba2ba 100644 --- a/configmgr/source/configurationregistry.cxx +++ b/configmgr/source/configurationregistry.cxx @@ -80,60 +80,41 @@ private: virtual ~Service() override {} - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getImplementationName() override { return configuration_registry::getImplementationName(); } - virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override + getSupportedServiceNames() override { return configuration_registry::getSupportedServiceNames(); } - virtual OUString SAL_CALL getURL() throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getURL() override; virtual void SAL_CALL open( - OUString const & rURL, sal_Bool bReadOnly, sal_Bool) - throw ( - css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) override; + OUString const & rURL, sal_Bool bReadOnly, sal_Bool) override; - virtual sal_Bool SAL_CALL isValid() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isValid() override; - virtual void SAL_CALL close() - throw ( - css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close() override; - virtual void SAL_CALL destroy() - throw ( - css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL destroy() override; virtual css::uno::Reference< css::registry::XRegistryKey > SAL_CALL - getRootKey() - throw ( - css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) override; + getRootKey() override; - virtual sal_Bool SAL_CALL isReadOnly() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isReadOnly() override; - virtual void SAL_CALL mergeKey(OUString const &, OUString const &) - throw ( - css::registry::InvalidRegistryException, - css::registry::MergeConflictException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL mergeKey(OUString const &, OUString const &) override; - virtual void SAL_CALL flush() throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL flush() override; virtual void SAL_CALL addFlushListener( - css::uno::Reference< css::util::XFlushListener > const &) - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::util::XFlushListener > const &) override; virtual void SAL_CALL removeFlushListener( - css::uno::Reference< css::util::XFlushListener > const &) - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Reference< css::util::XFlushListener > const &) override; void checkValid(); @@ -163,155 +144,73 @@ private: virtual ~RegistryKey() override {} - virtual OUString SAL_CALL getKeyName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getKeyName() override; - virtual sal_Bool SAL_CALL isReadOnly() - throw ( - css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isReadOnly() override; - virtual sal_Bool SAL_CALL isValid() throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isValid() override; virtual css::registry::RegistryKeyType SAL_CALL getKeyType( - OUString const &) - throw ( - css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) override; - - virtual css::registry::RegistryValueType SAL_CALL getValueType() - throw ( - css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) override; - - virtual sal_Int32 SAL_CALL getLongValue() - throw ( - css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override; - - virtual void SAL_CALL setLongValue(sal_Int32) - throw ( - css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) override; - - virtual css::uno::Sequence< sal_Int32 > SAL_CALL getLongListValue() - throw ( - css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override; + OUString const &) override; + + virtual css::registry::RegistryValueType SAL_CALL getValueType() override; + + virtual sal_Int32 SAL_CALL getLongValue() override; + + virtual void SAL_CALL setLongValue(sal_Int32) override; + + virtual css::uno::Sequence< sal_Int32 > SAL_CALL getLongListValue() override; virtual void SAL_CALL setLongListValue( - css::uno::Sequence< sal_Int32 > const &) - throw ( - css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) override; - - virtual OUString SAL_CALL getAsciiValue() - throw ( - css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override; - - virtual void SAL_CALL setAsciiValue(OUString const &) - throw ( - css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) override; - - virtual css::uno::Sequence< OUString > SAL_CALL getAsciiListValue() - throw ( - css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< sal_Int32 > const &) override; + + virtual OUString SAL_CALL getAsciiValue() override; + + virtual void SAL_CALL setAsciiValue(OUString const &) override; + + virtual css::uno::Sequence< OUString > SAL_CALL getAsciiListValue() override; virtual void SAL_CALL setAsciiListValue( - css::uno::Sequence< OUString > const &) - throw ( - css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) override; - - virtual OUString SAL_CALL getStringValue() - throw ( - css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override; - - virtual void SAL_CALL setStringValue(OUString const &) - throw ( - css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) override; - - virtual css::uno::Sequence< OUString > SAL_CALL getStringListValue() - throw ( - css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< OUString > const &) override; + + virtual OUString SAL_CALL getStringValue() override; + + virtual void SAL_CALL setStringValue(OUString const &) override; + + virtual css::uno::Sequence< OUString > SAL_CALL getStringListValue() override; virtual void SAL_CALL setStringListValue( - css::uno::Sequence< OUString > const &) - throw ( - css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< OUString > const &) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBinaryValue() - throw ( - css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBinaryValue() override; - virtual void SAL_CALL setBinaryValue(css::uno::Sequence< sal_Int8 > const &) - throw ( - css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setBinaryValue(css::uno::Sequence< sal_Int8 > const &) override; virtual css::uno::Reference< css::registry::XRegistryKey > SAL_CALL openKey( - OUString const & aKeyName) - throw ( - css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) override; + OUString const & aKeyName) override; virtual css::uno::Reference< css::registry::XRegistryKey > SAL_CALL - createKey(OUString const &) - throw ( - css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) override; + createKey(OUString const &) override; - virtual void SAL_CALL closeKey() - throw ( - css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL closeKey() override; - virtual void SAL_CALL deleteKey(OUString const &) - throw ( - css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL deleteKey(OUString const &) override; virtual css::uno::Sequence< css::uno::Reference< css::registry::XRegistryKey > > - SAL_CALL openKeys() - throw ( - css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) override; + SAL_CALL openKeys() override; - virtual css::uno::Sequence< OUString > SAL_CALL getKeyNames() - throw ( - css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getKeyNames() override; virtual sal_Bool SAL_CALL createLink( - OUString const &, OUString const &) - throw ( - css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) override; + OUString const &, OUString const &) override; - virtual void SAL_CALL deleteLink(OUString const &) - throw ( - css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL deleteLink(OUString const &) override; - virtual OUString SAL_CALL getLinkTarget(OUString const &) - throw ( - css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getLinkTarget(OUString const &) override; virtual OUString SAL_CALL getResolvedName( - OUString const & aKeyName) - throw ( - css::registry::InvalidRegistryException, - css::uno::RuntimeException, std::exception) override; + OUString const & aKeyName) override; Service & service_; css::uno::Any value_; @@ -338,14 +237,13 @@ Service::Service( } } -OUString Service::getURL() throw (css::uno::RuntimeException, std::exception) { +OUString Service::getURL() { osl::MutexGuard g(mutex_); checkValid_RuntimeException(); return url_; } void Service::open(OUString const & rURL, sal_Bool bReadOnly, sal_Bool) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { //TODO: bCreate osl::MutexGuard g(mutex_); @@ -373,13 +271,12 @@ void Service::open(OUString const & rURL, sal_Bool bReadOnly, sal_Bool) readOnly_ = bReadOnly; } -sal_Bool Service::isValid() throw (css::uno::RuntimeException, std::exception) { +sal_Bool Service::isValid() { osl::MutexGuard g(mutex_); return access_.is(); } void Service::close() - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { osl::MutexGuard g(mutex_); checkValid(); @@ -387,7 +284,6 @@ void Service::close() } void Service::destroy() - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { throw css::uno::RuntimeException( "com.sun.star.configuration.ConfigurationRegistry: not implemented", @@ -395,30 +291,26 @@ void Service::destroy() } css::uno::Reference< css::registry::XRegistryKey > Service::getRootKey() - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { osl::MutexGuard g(mutex_); checkValid(); return new RegistryKey(*this, css::uno::makeAny(access_)); } -sal_Bool Service::isReadOnly() throw (css::uno::RuntimeException, std::exception) { +sal_Bool Service::isReadOnly() { osl::MutexGuard g(mutex_); checkValid_RuntimeException(); return readOnly_; } void Service::mergeKey(OUString const &, OUString const &) - throw ( - css::registry::InvalidRegistryException, - css::registry::MergeConflictException, css::uno::RuntimeException, std::exception) { throw css::uno::RuntimeException( "com.sun.star.configuration.ConfigurationRegistry: not implemented", static_cast< cppu::OWeakObject * >(this)); } -void Service::flush() throw (css::uno::RuntimeException, std::exception) +void Service::flush() { throw css::uno::RuntimeException( "com.sun.star.configuration.ConfigurationRegistry: not implemented", @@ -427,7 +319,6 @@ void Service::flush() throw (css::uno::RuntimeException, std::exception) void Service::addFlushListener( css::uno::Reference< css::util::XFlushListener > const &) - throw (css::uno::RuntimeException, std::exception) { throw css::uno::RuntimeException( "com.sun.star.configuration.ConfigurationRegistry: not implemented", @@ -436,7 +327,6 @@ void Service::addFlushListener( void Service::removeFlushListener( css::uno::Reference< css::util::XFlushListener > const &) - throw (css::uno::RuntimeException, std::exception) { throw css::uno::RuntimeException( "com.sun.star.configuration.ConfigurationRegistry: not implemented", @@ -463,7 +353,7 @@ void Service::doClose() { access_.clear(); } -OUString RegistryKey::getKeyName() throw (css::uno::RuntimeException, std::exception) { +OUString RegistryKey::getKeyName() { osl::MutexGuard g(service_.mutex_); service_.checkValid_RuntimeException(); css::uno::Reference< css::container::XNamed > named; @@ -476,19 +366,17 @@ OUString RegistryKey::getKeyName() throw (css::uno::RuntimeException, std::excep } sal_Bool RegistryKey::isReadOnly() - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { osl::MutexGuard g(service_.mutex_); service_.checkValid_RuntimeException(); return service_.readOnly_; //TODO: read-only sub-nodes in update access? } -sal_Bool RegistryKey::isValid() throw (css::uno::RuntimeException, std::exception) { +sal_Bool RegistryKey::isValid() { return service_.isValid(); } css::registry::RegistryKeyType RegistryKey::getKeyType(OUString const &) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { osl::MutexGuard g(service_.mutex_); service_.checkValid(); @@ -496,7 +384,6 @@ css::registry::RegistryKeyType RegistryKey::getKeyType(OUString const &) } css::registry::RegistryValueType RegistryKey::getValueType() - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { osl::MutexGuard g(service_.mutex_); service_.checkValid(); @@ -524,9 +411,6 @@ css::registry::RegistryValueType RegistryKey::getValueType() } sal_Int32 RegistryKey::getLongValue() - throw ( - css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) { osl::MutexGuard g(service_.mutex_); service_.checkValid(); @@ -540,7 +424,6 @@ sal_Int32 RegistryKey::getLongValue() } void RegistryKey::setLongValue(sal_Int32) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { throw css::uno::RuntimeException( "com.sun.star.configuration.ConfigurationRegistry: not implemented", @@ -548,9 +431,6 @@ void RegistryKey::setLongValue(sal_Int32) } css::uno::Sequence< sal_Int32 > RegistryKey::getLongListValue() - throw ( - css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) { osl::MutexGuard g(service_.mutex_); service_.checkValid(); @@ -564,7 +444,6 @@ css::uno::Sequence< sal_Int32 > RegistryKey::getLongListValue() } void RegistryKey::setLongListValue(css::uno::Sequence< sal_Int32 > const &) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { throw css::uno::RuntimeException( "com.sun.star.configuration.ConfigurationRegistry: not implemented", @@ -572,9 +451,6 @@ void RegistryKey::setLongListValue(css::uno::Sequence< sal_Int32 > const &) } OUString RegistryKey::getAsciiValue() - throw ( - css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) { osl::MutexGuard g(service_.mutex_); service_.checkValid(); @@ -588,7 +464,6 @@ OUString RegistryKey::getAsciiValue() } void RegistryKey::setAsciiValue(OUString const &) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { throw css::uno::RuntimeException( "com.sun.star.configuration.ConfigurationRegistry: not implemented", @@ -596,9 +471,6 @@ void RegistryKey::setAsciiValue(OUString const &) } css::uno::Sequence< OUString > RegistryKey::getAsciiListValue() - throw ( - css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) { osl::MutexGuard g(service_.mutex_); service_.checkValid(); @@ -612,7 +484,6 @@ css::uno::Sequence< OUString > RegistryKey::getAsciiListValue() } void RegistryKey::setAsciiListValue(css::uno::Sequence< OUString > const &) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { throw css::uno::RuntimeException( "com.sun.star.configuration.ConfigurationRegistry: not implemented", @@ -620,9 +491,6 @@ void RegistryKey::setAsciiListValue(css::uno::Sequence< OUString > const &) } OUString RegistryKey::getStringValue() - throw ( - css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) { osl::MutexGuard g(service_.mutex_); service_.checkValid(); @@ -636,7 +504,6 @@ OUString RegistryKey::getStringValue() } void RegistryKey::setStringValue(OUString const &) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { throw css::uno::RuntimeException( "com.sun.star.configuration.ConfigurationRegistry: not implemented", @@ -644,9 +511,6 @@ void RegistryKey::setStringValue(OUString const &) } css::uno::Sequence< OUString > RegistryKey::getStringListValue() - throw ( - css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) { osl::MutexGuard g(service_.mutex_); service_.checkValid(); @@ -661,7 +525,6 @@ css::uno::Sequence< OUString > RegistryKey::getStringListValue() void RegistryKey::setStringListValue( css::uno::Sequence< OUString > const &) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { throw css::uno::RuntimeException( "com.sun.star.configuration.ConfigurationRegistry: not implemented", @@ -669,9 +532,6 @@ void RegistryKey::setStringListValue( } css::uno::Sequence< sal_Int8 > RegistryKey::getBinaryValue() - throw ( - css::registry::InvalidRegistryException, - css::registry::InvalidValueException, css::uno::RuntimeException, std::exception) { osl::MutexGuard g(service_.mutex_); service_.checkValid(); @@ -685,7 +545,6 @@ css::uno::Sequence< sal_Int8 > RegistryKey::getBinaryValue() } void RegistryKey::setBinaryValue(css::uno::Sequence< sal_Int8 > const &) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { throw css::uno::RuntimeException( "com.sun.star.configuration.ConfigurationRegistry: not implemented", @@ -694,7 +553,6 @@ void RegistryKey::setBinaryValue(css::uno::Sequence< sal_Int8 > const &) css::uno::Reference< css::registry::XRegistryKey > RegistryKey::openKey( OUString const & aKeyName) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { osl::MutexGuard g(service_.mutex_); service_.checkValid_RuntimeException(); @@ -710,8 +568,6 @@ css::uno::Reference< css::registry::XRegistryKey > RegistryKey::openKey( css::uno::Reference< css::registry::XRegistryKey > RegistryKey::createKey( OUString const &) - throw ( - css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { throw css::uno::RuntimeException( "com.sun.star.configuration.ConfigurationRegistry: not implemented", @@ -719,15 +575,12 @@ css::uno::Reference< css::registry::XRegistryKey > RegistryKey::createKey( } void RegistryKey::closeKey() - throw ( - css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { osl::MutexGuard g(service_.mutex_); service_.checkValid_RuntimeException(); } void RegistryKey::deleteKey(OUString const &) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { throw css::uno::RuntimeException( "com.sun.star.configuration.ConfigurationRegistry: not implemented", @@ -736,7 +589,6 @@ void RegistryKey::deleteKey(OUString const &) css::uno::Sequence< css::uno::Reference< css::registry::XRegistryKey > > RegistryKey::openKeys() - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { throw css::uno::RuntimeException( "com.sun.star.configuration.ConfigurationRegistry: not implemented", @@ -744,7 +596,6 @@ RegistryKey::openKeys() } css::uno::Sequence< OUString > RegistryKey::getKeyNames() - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { throw css::uno::RuntimeException( "com.sun.star.configuration.ConfigurationRegistry: not implemented", @@ -752,7 +603,6 @@ css::uno::Sequence< OUString > RegistryKey::getKeyNames() } sal_Bool RegistryKey::createLink(OUString const &, OUString const &) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { osl::MutexGuard g(service_.mutex_); service_.checkValid_RuntimeException(); @@ -760,14 +610,12 @@ sal_Bool RegistryKey::createLink(OUString const &, OUString const &) } void RegistryKey::deleteLink(OUString const &) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { osl::MutexGuard g(service_.mutex_); service_.checkValid_RuntimeException(); } OUString RegistryKey::getLinkTarget(OUString const &) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { osl::MutexGuard g(service_.mutex_); service_.checkValid_RuntimeException(); @@ -775,7 +623,6 @@ OUString RegistryKey::getLinkTarget(OUString const &) } OUString RegistryKey::getResolvedName(OUString const & aKeyName) - throw (css::registry::InvalidRegistryException, css::uno::RuntimeException, std::exception) { osl::MutexGuard g(service_.mutex_); service_.checkValid_RuntimeException(); diff --git a/configmgr/source/readonlyaccess.cxx b/configmgr/source/readonlyaccess.cxx index 9ff6c10acfa7..b14ad3dc59b8 100644 --- a/configmgr/source/readonlyaccess.cxx +++ b/configmgr/source/readonlyaccess.cxx @@ -56,30 +56,24 @@ private: virtual ~Service() override {} - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getImplementationName() override { return read_only_access::getImplementationName(); } - virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override + getSupportedServiceNames() override { return read_only_access::getSupportedServiceNames(); } virtual void SAL_CALL initialize( - css::uno::Sequence< css::uno::Any > const & aArguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< css::uno::Any > const & aArguments) override; virtual css::uno::Any SAL_CALL getByHierarchicalName( - OUString const & aName) - throw ( - css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override + OUString const & aName) override { return getRoot()->getByHierarchicalName(aName); } - virtual sal_Bool SAL_CALL hasByHierarchicalName(OUString const & aName) - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasByHierarchicalName(OUString const & aName) override { return getRoot()->hasByHierarchicalName(aName); } rtl::Reference< RootAccess > getRoot(); @@ -91,7 +85,6 @@ private: }; void Service::initialize(css::uno::Sequence< css::uno::Any > const & aArguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { OUString locale; if (aArguments.getLength() != 1 || !(aArguments[0] >>= locale)) { diff --git a/configmgr/source/readwriteaccess.cxx b/configmgr/source/readwriteaccess.cxx index 9ebf2f9dee65..422451c3e319 100644 --- a/configmgr/source/readwriteaccess.cxx +++ b/configmgr/source/readwriteaccess.cxx @@ -58,63 +58,46 @@ private: virtual ~Service() override {} - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override + virtual OUString SAL_CALL getImplementationName() override { return read_write_access::getImplementationName(); } - virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override { return cppu::supportsService(this, ServiceName); } virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override + getSupportedServiceNames() override { return read_write_access::getSupportedServiceNames(); } virtual void SAL_CALL initialize( - css::uno::Sequence< css::uno::Any > const & aArguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< css::uno::Any > const & aArguments) override; virtual css::uno::Any SAL_CALL getByHierarchicalName( - OUString const & aName) - throw ( - css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) override + OUString const & aName) override { return getRoot()->getByHierarchicalName(aName); } - virtual sal_Bool SAL_CALL hasByHierarchicalName(OUString const & aName) - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasByHierarchicalName(OUString const & aName) override { return getRoot()->hasByHierarchicalName(aName); } virtual void SAL_CALL replaceByHierarchicalName( - OUString const & aName, css::uno::Any const & aElement) - throw ( - css::lang::IllegalArgumentException, - css::container::NoSuchElementException, - css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + OUString const & aName, css::uno::Any const & aElement) override { getRoot()->replaceByHierarchicalName(aName, aElement); } - virtual void SAL_CALL commitChanges() - throw (css::lang::WrappedTargetException, css::uno::RuntimeException, std::exception) override + virtual void SAL_CALL commitChanges() override { getRoot()->commitChanges(); } - virtual sal_Bool SAL_CALL hasPendingChanges() - throw (css::uno::RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasPendingChanges() override { return getRoot()->hasPendingChanges(); } - virtual css::util::ChangesSet SAL_CALL getPendingChanges() - throw (css::uno::RuntimeException, std::exception) override + virtual css::util::ChangesSet SAL_CALL getPendingChanges() override { return getRoot()->getPendingChanges(); } css::beans::Property SAL_CALL getPropertyByHierarchicalName( OUString const & aHierarchicalName) - throw ( - css::beans::UnknownPropertyException, css::uno::RuntimeException, - std::exception) override { return getRoot()->getPropertyByHierarchicalName(aHierarchicalName); } sal_Bool SAL_CALL hasPropertyByHierarchicalName( - OUString const & aHierarchicalName) - throw (css::uno::RuntimeException, std::exception) override + OUString const & aHierarchicalName) override { return getRoot()->hasPropertyByHierarchicalName(aHierarchicalName); } rtl::Reference< RootAccess > getRoot(); @@ -126,7 +109,6 @@ private: }; void Service::initialize(css::uno::Sequence< css::uno::Any > const & aArguments) - throw (css::uno::Exception, css::uno::RuntimeException, std::exception) { OUString locale; if (aArguments.getLength() != 1 || !(aArguments[0] >>= locale)) { diff --git a/configmgr/source/rootaccess.cxx b/configmgr/source/rootaccess.cxx index 3d4bbd5b4345..ec47b20cb9b8 100644 --- a/configmgr/source/rootaccess.cxx +++ b/configmgr/source/rootaccess.cxx @@ -113,7 +113,6 @@ void RootAccess::setAlive(bool b) { void RootAccess::addChangesListener( css::uno::Reference< css::util::XChangesListener > const & aListener) - throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); { @@ -136,7 +135,6 @@ void RootAccess::addChangesListener( void RootAccess::removeChangesListener( css::uno::Reference< css::util::XChangesListener > const & aListener) - throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -148,9 +146,6 @@ void RootAccess::removeChangesListener( } void RootAccess::commitChanges() - throw (css::lang::WrappedTargetException, - css::uno::RuntimeException, - std::exception) { assert(thisIs(IS_UPDATE)); if (!alive_) @@ -176,7 +171,7 @@ void RootAccess::commitChanges() bc.send(); } -sal_Bool RootAccess::hasPendingChanges() throw (css::uno::RuntimeException, std::exception) { +sal_Bool RootAccess::hasPendingChanges() { assert(thisIs(IS_UPDATE)); osl::MutexGuard g(*lock_); checkLocalizedPropertyAccess(); @@ -187,7 +182,6 @@ sal_Bool RootAccess::hasPendingChanges() throw (css::uno::RuntimeException, std: } css::util::ChangesSet RootAccess::getPendingChanges() - throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_UPDATE)); osl::MutexGuard g(*lock_); @@ -289,7 +283,6 @@ void RootAccess::clearListeners() throw() { } css::uno::Any RootAccess::queryInterface(css::uno::Type const & aType) - throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); @@ -311,7 +304,6 @@ css::uno::Any RootAccess::queryInterface(css::uno::Type const & aType) } OUString RootAccess::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { assert(thisIs(IS_ANY)); osl::MutexGuard g(*lock_); diff --git a/configmgr/source/rootaccess.hxx b/configmgr/source/rootaccess.hxx index b0efeeeab842..1f4203ba9803 100644 --- a/configmgr/source/rootaccess.hxx +++ b/configmgr/source/rootaccess.hxx @@ -80,25 +80,17 @@ public: virtual void SAL_CALL addChangesListener( css::uno::Reference< css::util::XChangesListener > - const & aListener) - throw (css::uno::RuntimeException, std::exception) override; + const & aListener) override; virtual void SAL_CALL removeChangesListener( css::uno::Reference< css::util::XChangesListener > - const & aListener) - throw (css::uno::RuntimeException, std::exception) override; + const & aListener) override; - virtual void SAL_CALL commitChanges() - throw ( - css::lang::WrappedTargetException, - css::uno::RuntimeException, - std::exception) override; + virtual void SAL_CALL commitChanges() override; - virtual sal_Bool SAL_CALL hasPendingChanges() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL hasPendingChanges() override; - virtual css::util::ChangesSet SAL_CALL getPendingChanges() - throw (css::uno::RuntimeException, std::exception) override; + virtual css::util::ChangesSet SAL_CALL getPendingChanges() override; private: virtual ~RootAccess() override; @@ -128,11 +120,9 @@ private: virtual void clearListeners() throw () override; virtual css::uno::Any SAL_CALL queryInterface( - css::uno::Type const & aType) - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Type const & aType) override; - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; typedef std::multiset< diff --git a/configmgr/source/update.cxx b/configmgr/source/update.cxx index 43cc4dd40430..a830dd616f73 100644 --- a/configmgr/source/update.cxx +++ b/configmgr/source/update.cxx @@ -74,23 +74,17 @@ private: virtual ~Service() override {} virtual void SAL_CALL insertExtensionXcsFile( - sal_Bool shared, OUString const & fileUri) - throw (css::uno::RuntimeException, std::exception) override; + sal_Bool shared, OUString const & fileUri) override; virtual void SAL_CALL insertExtensionXcuFile( - sal_Bool shared, OUString const & fileUri) - throw (css::uno::RuntimeException, - std::exception) override; + sal_Bool shared, OUString const & fileUri) override; - virtual void SAL_CALL removeExtensionXcuFile(OUString const & fileUri) - throw (css::uno::RuntimeException, - std::exception) override; + virtual void SAL_CALL removeExtensionXcuFile(OUString const & fileUri) override; virtual void SAL_CALL insertModificationXcuFile( OUString const & fileUri, css::uno::Sequence< OUString > const & includedPaths, - css::uno::Sequence< OUString > const & excludedPaths) - throw (css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< OUString > const & excludedPaths) override; std::shared_ptr lock_; css::uno::Reference< css::uno::XComponentContext > context_; @@ -98,7 +92,6 @@ private: void Service::insertExtensionXcsFile( sal_Bool shared, OUString const & fileUri) - throw (css::uno::RuntimeException, std::exception) { osl::MutexGuard g(*lock_); Components::getSingleton(context_).insertExtensionXcsFile(shared, fileUri); @@ -106,8 +99,6 @@ void Service::insertExtensionXcsFile( void Service::insertExtensionXcuFile( sal_Bool shared, OUString const & fileUri) - throw (css::uno::RuntimeException, - std::exception) { Broadcaster bc; { @@ -122,7 +113,6 @@ void Service::insertExtensionXcuFile( } void Service::removeExtensionXcuFile(OUString const & fileUri) - throw (css::uno::RuntimeException, std::exception) { Broadcaster bc; { @@ -140,7 +130,6 @@ void Service::insertModificationXcuFile( OUString const & fileUri, css::uno::Sequence< OUString > const & includedPaths, css::uno::Sequence< OUString > const & excludedPaths) - throw (css::uno::RuntimeException, std::exception) { Broadcaster bc; { diff --git a/connectivity/source/commontools/BlobHelper.cxx b/connectivity/source/commontools/BlobHelper.cxx index 396e3567490f..05e047b9ec72 100644 --- a/connectivity/source/commontools/BlobHelper.cxx +++ b/connectivity/source/commontools/BlobHelper.cxx @@ -29,19 +29,19 @@ BlobHelper::BlobHelper(const css::uno::Sequence< sal_Int8 >& _val) : m_aValue(_v { } -::sal_Int64 SAL_CALL BlobHelper::length( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +::sal_Int64 SAL_CALL BlobHelper::length( ) { return m_aValue.getLength(); } -css::uno::Sequence< ::sal_Int8 > SAL_CALL BlobHelper::getBytes( ::sal_Int64 pos, ::sal_Int32 _length ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +css::uno::Sequence< ::sal_Int8 > SAL_CALL BlobHelper::getBytes( ::sal_Int64 pos, ::sal_Int32 _length ) { if ( sal_Int32(pos + _length) > m_aValue.getLength() ) throw css::sdbc::SQLException(); return css::uno::Sequence< ::sal_Int8 >(m_aValue.getConstArray() + sal_Int32(pos),_length); } -css::uno::Reference< css::io::XInputStream > SAL_CALL BlobHelper::getBinaryStream( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +css::uno::Reference< css::io::XInputStream > SAL_CALL BlobHelper::getBinaryStream( ) { return new ::comphelper::SequenceInputStream(m_aValue); } @@ -53,13 +53,13 @@ css::uno::Reference< css::io::XInputStream > SAL_CALL BlobHelper::getBinaryStrea SAL_WNOUNREACHABLE_CODE_PUSH -::sal_Int64 SAL_CALL BlobHelper::position( const css::uno::Sequence< ::sal_Int8 >& /*pattern*/, ::sal_Int64 /*start*/ ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +::sal_Int64 SAL_CALL BlobHelper::position( const css::uno::Sequence< ::sal_Int8 >& /*pattern*/, ::sal_Int64 /*start*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XBlob::position", *this ); return 0; } -::sal_Int64 SAL_CALL BlobHelper::positionOfBlob( const css::uno::Reference< css::sdbc::XBlob >& /*pattern*/, ::sal_Int64 /*start*/ ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +::sal_Int64 SAL_CALL BlobHelper::positionOfBlob( const css::uno::Reference< css::sdbc::XBlob >& /*pattern*/, ::sal_Int64 /*start*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XBlob::positionOfBlob", *this ); return 0; diff --git a/connectivity/source/commontools/ConnectionWrapper.cxx b/connectivity/source/commontools/ConnectionWrapper.cxx index f28c0e8ab538..2e8be47952bf 100644 --- a/connectivity/source/commontools/ConnectionWrapper.cxx +++ b/connectivity/source/commontools/ConnectionWrapper.cxx @@ -105,13 +105,13 @@ OConnectionWrapper::~OConnectionWrapper() // XServiceInfo -OUString SAL_CALL OConnectionWrapper::getImplementationName( ) throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL OConnectionWrapper::getImplementationName( ) { return OUString( "com.sun.star.sdbc.drivers.OConnectionWrapper" ); } -css::uno::Sequence< OUString > SAL_CALL OConnectionWrapper::getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) +css::uno::Sequence< OUString > SAL_CALL OConnectionWrapper::getSupportedServiceNames( ) { // first collect the services which are supported by our aggregate Sequence< OUString > aSupported; @@ -132,19 +132,19 @@ css::uno::Sequence< OUString > SAL_CALL OConnectionWrapper::getSupportedServiceN } -sal_Bool SAL_CALL OConnectionWrapper::supportsService( const OUString& _rServiceName ) throw(css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL OConnectionWrapper::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } -Any SAL_CALL OConnectionWrapper::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception) +Any SAL_CALL OConnectionWrapper::queryInterface( const Type& _rType ) { Any aReturn = OConnection_BASE::queryInterface(_rType); return aReturn.hasValue() ? aReturn : (m_xProxyConnection.is() ? m_xProxyConnection->queryAggregation(_rType) : aReturn); } -Sequence< Type > SAL_CALL OConnectionWrapper::getTypes( ) throw (css::uno::RuntimeException, std::exception) +Sequence< Type > SAL_CALL OConnectionWrapper::getTypes( ) { return ::comphelper::concatSequences( OConnection_BASE::getTypes(), @@ -153,7 +153,7 @@ Sequence< Type > SAL_CALL OConnectionWrapper::getTypes( ) throw (css::uno::Runt } // css::lang::XUnoTunnel -sal_Int64 SAL_CALL OConnectionWrapper::getSomething( const Sequence< sal_Int8 >& rId ) throw(RuntimeException, std::exception) +sal_Int64 SAL_CALL OConnectionWrapper::getSomething( const Sequence< sal_Int8 >& rId ) { if (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) return reinterpret_cast< sal_Int64 >( this ); diff --git a/connectivity/source/commontools/DateConversion.cxx b/connectivity/source/commontools/DateConversion.cxx index 1986adc5e08e..209332ebeb38 100644 --- a/connectivity/source/commontools/DateConversion.cxx +++ b/connectivity/source/commontools/DateConversion.cxx @@ -234,7 +234,7 @@ void DBTypeConversion::setValue(const Reference& xVariant, const OUString& rString, sal_Int32 nKey, sal_Int16 nFieldType, - sal_Int16 nKeyType) throw(css::lang::IllegalArgumentException) + sal_Int16 nKeyType) { if (!rString.isEmpty()) { @@ -332,7 +332,7 @@ void DBTypeConversion::setValue(const Reference& xVariant, void DBTypeConversion::setValue(const Reference& xVariant, const Date& rNullDate, const double& rValue, - sal_Int16 nKeyType) throw(css::lang::IllegalArgumentException) + sal_Int16 nKeyType) { switch (nKeyType & ~NumberFormat::DEFINED) { diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx index f3192a1e4e4e..d8e847711f8d 100644 --- a/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx +++ b/connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx @@ -141,13 +141,13 @@ void SAL_CALL ODatabaseMetaDataResultSet::release() throw() ODatabaseMetaDataResultSet_BASE::release(); } -Any SAL_CALL ODatabaseMetaDataResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL ODatabaseMetaDataResultSet::queryInterface( const Type & rType ) { Any aRet = OPropertySetHelper::queryInterface(rType); return aRet.hasValue() ? aRet : ODatabaseMetaDataResultSet_BASE::queryInterface(rType); } -Sequence< Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes( ) { ::cppu::OTypeCollection aTypes( cppu::UnoType::get(), cppu::UnoType::get(), @@ -163,7 +163,7 @@ void ODatabaseMetaDataResultSet::setRows(const ORows& _rRows) m_bEOF = m_aRows.empty(); } -sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& columnName ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed ); @@ -187,78 +187,78 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& colum #endif } -void ODatabaseMetaDataResultSet::checkIndex(sal_Int32 columnIndex ) throw(css::sdbc::SQLException) +void ODatabaseMetaDataResultSet::checkIndex(sal_Int32 columnIndex ) { if(columnIndex >= (sal_Int32)(*m_aRowsIter).size() || columnIndex < 1) ::dbtools::throwInvalidIndexException(*this); } -Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) { return nullptr; } -Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) { return nullptr; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::getBoolean( sal_Int32 columnIndex ) { return bool(getValue(columnIndex)); } -sal_Int8 SAL_CALL ODatabaseMetaDataResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int8 SAL_CALL ODatabaseMetaDataResultSet::getByte( sal_Int32 columnIndex ) { return getValue(columnIndex); } -Sequence< sal_Int8 > SAL_CALL ODatabaseMetaDataResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Sequence< sal_Int8 > SAL_CALL ODatabaseMetaDataResultSet::getBytes( sal_Int32 columnIndex ) { return getValue(columnIndex); } -css::util::Date SAL_CALL ODatabaseMetaDataResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::Date SAL_CALL ODatabaseMetaDataResultSet::getDate( sal_Int32 columnIndex ) { return getValue(columnIndex); } -double SAL_CALL ODatabaseMetaDataResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +double SAL_CALL ODatabaseMetaDataResultSet::getDouble( sal_Int32 columnIndex ) { return getValue(columnIndex); } -float SAL_CALL ODatabaseMetaDataResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +float SAL_CALL ODatabaseMetaDataResultSet::getFloat( sal_Int32 columnIndex ) { return getValue(columnIndex); } -sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getInt( sal_Int32 columnIndex ) { return getValue(columnIndex); } -sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getRow( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getRow( ) { return 0; } -sal_Int64 SAL_CALL ODatabaseMetaDataResultSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int64 SAL_CALL ODatabaseMetaDataResultSet::getLong( sal_Int32 columnIndex ) { return getValue(columnIndex); } -Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed ); @@ -270,60 +270,60 @@ Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData return m_xMetaData; } -Reference< XArray > SAL_CALL ODatabaseMetaDataResultSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XArray > SAL_CALL ODatabaseMetaDataResultSet::getArray( sal_Int32 /*columnIndex*/ ) { return nullptr; } -Reference< XClob > SAL_CALL ODatabaseMetaDataResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XClob > SAL_CALL ODatabaseMetaDataResultSet::getClob( sal_Int32 /*columnIndex*/ ) { return nullptr; } -Reference< XBlob > SAL_CALL ODatabaseMetaDataResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XBlob > SAL_CALL ODatabaseMetaDataResultSet::getBlob( sal_Int32 /*columnIndex*/ ) { return nullptr; } -Reference< XRef > SAL_CALL ODatabaseMetaDataResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XRef > SAL_CALL ODatabaseMetaDataResultSet::getRef( sal_Int32 /*columnIndex*/ ) { return nullptr; } -Any SAL_CALL ODatabaseMetaDataResultSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL ODatabaseMetaDataResultSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ ) { return getValue(columnIndex).makeAny(); } -sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex ) { return getValue(columnIndex); } -OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) { return getValue(columnIndex); } -css::util::Time SAL_CALL ODatabaseMetaDataResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::Time SAL_CALL ODatabaseMetaDataResultSet::getTime( sal_Int32 columnIndex ) { return getValue(columnIndex); } -css::util::DateTime SAL_CALL ODatabaseMetaDataResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::DateTime SAL_CALL ODatabaseMetaDataResultSet::getTimestamp( sal_Int32 columnIndex ) { return getValue(columnIndex); } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isAfterLast( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isAfterLast( ) { return m_bEOF; } @@ -331,13 +331,13 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isAfterLast( ) throw(SQLException SAL_WNOUNREACHABLE_CODE_PUSH -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isFirst( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isFirst( ) { ::dbtools::throwFunctionSequenceException(*this); return false; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast( ) { ::dbtools::throwFunctionSequenceException(*this); return false; @@ -346,18 +346,18 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast( ) throw(SQLException, Run SAL_WNOUNREACHABLE_CODE_POP -void SAL_CALL ODatabaseMetaDataResultSet::beforeFirst( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ODatabaseMetaDataResultSet::beforeFirst( ) { ::dbtools::throwFunctionSequenceException(*this); } -void SAL_CALL ODatabaseMetaDataResultSet::afterLast( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ODatabaseMetaDataResultSet::afterLast( ) { ::dbtools::throwFunctionSequenceException(*this); } -void SAL_CALL ODatabaseMetaDataResultSet::close( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ODatabaseMetaDataResultSet::close( ) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -370,32 +370,32 @@ void SAL_CALL ODatabaseMetaDataResultSet::close( ) throw(SQLException, RuntimeE SAL_WNOUNREACHABLE_CODE_PUSH -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::first( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::first( ) { ::dbtools::throwFunctionSequenceException(*this); return false; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::last( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::last( ) { ::dbtools::throwFunctionSequenceException(*this); return false; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::absolute( sal_Int32 /*row*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::absolute( sal_Int32 /*row*/ ) { ::dbtools::throwFunctionSequenceException(*this); return false; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::relative( sal_Int32 /*row*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::relative( sal_Int32 /*row*/ ) { ::dbtools::throwFunctionSequenceException(*this); return false; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous( ) { ::dbtools::throwFunctionSequenceException(*this); return false; @@ -404,7 +404,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous( ) throw(SQLException, R SAL_WNOUNREACHABLE_CODE_POP -Reference< XInterface > SAL_CALL ODatabaseMetaDataResultSet::getStatement( ) throw(SQLException, RuntimeException, std::exception) +Reference< XInterface > SAL_CALL ODatabaseMetaDataResultSet::getStatement( ) { return m_aStatement.get(); } @@ -412,19 +412,19 @@ Reference< XInterface > SAL_CALL ODatabaseMetaDataResultSet::getStatement( ) th SAL_WNOUNREACHABLE_CODE_PUSH -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowDeleted( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowDeleted( ) { ::dbtools::throwFunctionSequenceException(*this); return false; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowInserted( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowInserted( ) { ::dbtools::throwFunctionSequenceException(*this); return false; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated( ) { ::dbtools::throwFunctionSequenceException(*this); return false; @@ -433,13 +433,13 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated( ) throw(SQLException, SAL_WNOUNREACHABLE_CODE_POP -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isBeforeFirst( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isBeforeFirst( ) { return m_bBOF; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed ); @@ -468,7 +468,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next( ) throw(SQLException, Runti } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::wasNull( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::wasNull( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed ); @@ -480,20 +480,20 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::wasNull( ) throw(SQLException, Ru return (*m_aRowsIter)[m_nColPos]->getValue().isNull(); } -void SAL_CALL ODatabaseMetaDataResultSet::refreshRow( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ODatabaseMetaDataResultSet::refreshRow( ) { } -void SAL_CALL ODatabaseMetaDataResultSet::cancel( ) throw(RuntimeException, std::exception) +void SAL_CALL ODatabaseMetaDataResultSet::cancel( ) { } -void SAL_CALL ODatabaseMetaDataResultSet::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ODatabaseMetaDataResultSet::clearWarnings( ) { } -Any SAL_CALL ODatabaseMetaDataResultSet::getWarnings( ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL ODatabaseMetaDataResultSet::getWarnings( ) { return Any(); } @@ -638,7 +638,7 @@ void ODatabaseMetaDataResultSet::setImportedKeysMap() m_xMetaData = pMetaData; } -Reference< css::beans::XPropertySetInfo > SAL_CALL ODatabaseMetaDataResultSet::getPropertySetInfo( ) throw(RuntimeException, std::exception) +Reference< css::beans::XPropertySetInfo > SAL_CALL ODatabaseMetaDataResultSet::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } @@ -747,7 +747,7 @@ ORowSetValueDecoratorRef const & ODatabaseMetaDataResultSet::getQuoteValue() return aValueRef; } -void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aArguments ) throw (Exception, RuntimeException, std::exception) +void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aArguments ) { if ( _aArguments.getLength() == 2 ) { @@ -845,28 +845,28 @@ void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aA // XServiceInfo - OUString ODatabaseMetaDataResultSet::getImplementationName_Static( ) throw(RuntimeException) + OUString ODatabaseMetaDataResultSet::getImplementationName_Static( ) { return OUString("org.openoffice.comp.helper.DatabaseMetaDataResultSet"); } - Sequence< OUString > ODatabaseMetaDataResultSet::getSupportedServiceNames_Static( ) throw (RuntimeException) + Sequence< OUString > ODatabaseMetaDataResultSet::getSupportedServiceNames_Static( ) { Sequence aSNS { "com.sun.star.sdbc.ResultSet" }; return aSNS; } - OUString SAL_CALL ODatabaseMetaDataResultSet::getImplementationName( ) throw(RuntimeException, std::exception) + OUString SAL_CALL ODatabaseMetaDataResultSet::getImplementationName( ) { return getImplementationName_Static(); } - sal_Bool SAL_CALL ODatabaseMetaDataResultSet::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) + sal_Bool SAL_CALL ODatabaseMetaDataResultSet::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } - Sequence< OUString > SAL_CALL ODatabaseMetaDataResultSet::getSupportedServiceNames( ) throw(RuntimeException, std::exception) + Sequence< OUString > SAL_CALL ODatabaseMetaDataResultSet::getSupportedServiceNames( ) { return getSupportedServiceNames_Static(); } @@ -874,7 +874,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::initialize( const Sequence< Any >& _aA namespace connectivity { /// @throws Exception - Reference< XInterface > SAL_CALL ODatabaseMetaDataResultSet_CreateInstance(const Reference< XComponentContext >& ) throw( Exception ) + Reference< XInterface > SAL_CALL ODatabaseMetaDataResultSet_CreateInstance(const Reference< XComponentContext >& ) { return *(new ODatabaseMetaDataResultSet()); } diff --git a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx index 99479ca760f0..bfa88bd36c8d 100644 --- a/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx +++ b/connectivity/source/commontools/FDatabaseMetaDataResultSetMetaData.cxx @@ -34,7 +34,7 @@ ODatabaseMetaDataResultSetMetaData::~ODatabaseMetaDataResultSetMetaData() { } -sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getColumnDisplaySize(); @@ -42,99 +42,99 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnDisplaySize( sal return 0; } -sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnType( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnType( sal_Int32 column ) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getColumnType(); return 1; } -sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnCount( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnCount( ) { return m_mColumns.size(); } -sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCaseSensitive( sal_Int32 column ) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isCaseSensitive(); return true; } -OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) { return OUString(); } -OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnName( sal_Int32 column ) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getColumnName(); return OUString(); } -OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getTableName( sal_Int32 column ) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getTableName(); return OUString(); } -OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) { return OUString(); } -OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnTypeName( sal_Int32 column ) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getColumnTypeName(); return OUString(); } -OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnLabel( sal_Int32 column ) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getColumnLabel(); return getColumnName(column); } -OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnServiceName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnServiceName( sal_Int32 column ) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getColumnServiceName(); return OUString(); } -sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCurrency( sal_Int32 column ) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isCurrency(); return false; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isAutoIncrement( sal_Int32 column ) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isAutoIncrement(); return false; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSigned( sal_Int32 column ) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isSigned(); return false; } -sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getPrecision( sal_Int32 column ) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getPrecision(); return 0; } -sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getScale( sal_Int32 column ) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getScale(); @@ -142,7 +142,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getScale( sal_Int32 colum return 0; } -sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::isNullable( sal_Int32 column ) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isNullable(); @@ -150,24 +150,24 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::isNullable( sal_Int32 col return sal_Int32(false); } -sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSearchable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSearchable( sal_Int32 column ) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isSearchable(); return true; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isReadOnly( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isReadOnly( sal_Int32 /*column*/ ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isDefinitelyWritable( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isDefinitelyWritable( sal_Int32 /*column*/ ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isWritable( sal_Int32 column ) { return isDefinitelyWritable(column); } diff --git a/connectivity/source/commontools/ParamterSubstitution.cxx b/connectivity/source/commontools/ParamterSubstitution.cxx index 59d24110c09b..c44b8f34b808 100644 --- a/connectivity/source/commontools/ParamterSubstitution.cxx +++ b/connectivity/source/commontools/ParamterSubstitution.cxx @@ -31,7 +31,7 @@ namespace connectivity ParameterSubstitution::ParameterSubstitution(const css::uno::Reference< css::uno::XComponentContext >& _rxContext ) : m_xContext(_rxContext) { } - void SAL_CALL ParameterSubstitution::initialize( const uno::Sequence< uno::Any >& _aArguments ) throw (uno::Exception, uno::RuntimeException, std::exception) + void SAL_CALL ParameterSubstitution::initialize( const uno::Sequence< uno::Any >& _aArguments ) { ::osl::MutexGuard aGuard(m_aMutex); comphelper::SequenceAsHashMap aArgs(_aArguments); @@ -40,27 +40,27 @@ namespace connectivity m_xConnection = xConnection; } - OUString ParameterSubstitution::getImplementationName_Static( ) throw(RuntimeException) + OUString ParameterSubstitution::getImplementationName_Static( ) { return OUString("org.openoffice.comp.helper.ParameterSubstitution"); } - OUString SAL_CALL ParameterSubstitution::getImplementationName( ) throw(RuntimeException, std::exception) + OUString SAL_CALL ParameterSubstitution::getImplementationName( ) { return getImplementationName_Static(); } - sal_Bool SAL_CALL ParameterSubstitution::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) + sal_Bool SAL_CALL ParameterSubstitution::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } - Sequence< OUString > SAL_CALL ParameterSubstitution::getSupportedServiceNames( ) throw(RuntimeException, std::exception) + Sequence< OUString > SAL_CALL ParameterSubstitution::getSupportedServiceNames( ) { return getSupportedServiceNames_Static(); } - Sequence< OUString > ParameterSubstitution::getSupportedServiceNames_Static( ) throw (RuntimeException) + Sequence< OUString > ParameterSubstitution::getSupportedServiceNames_Static( ) { Sequence aSNS { "com.sun.star.sdb.ParameterSubstitution" }; return aSNS; @@ -72,7 +72,7 @@ namespace connectivity return *(new ParameterSubstitution(_xContext)); } - OUString SAL_CALL ParameterSubstitution::substituteVariables( const OUString& _sText, sal_Bool /*bSubstRequired*/ ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) + OUString SAL_CALL ParameterSubstitution::substituteVariables( const OUString& _sText, sal_Bool /*bSubstRequired*/ ) { OUString sRet = _sText; uno::Reference< sdbc::XConnection > xConnection = m_xConnection; @@ -99,12 +99,12 @@ namespace connectivity return sRet; } - OUString SAL_CALL ParameterSubstitution::reSubstituteVariables( const OUString& _sText ) throw (css::uno::RuntimeException, std::exception) + OUString SAL_CALL ParameterSubstitution::reSubstituteVariables( const OUString& _sText ) { return _sText; } - OUString SAL_CALL ParameterSubstitution::getSubstituteVariableValue( const OUString& /*variable*/ ) throw (css::container::NoSuchElementException, css::uno::RuntimeException, std::exception) + OUString SAL_CALL ParameterSubstitution::getSubstituteVariableValue( const OUString& /*variable*/ ) { throw container::NoSuchElementException(); } diff --git a/connectivity/source/commontools/TColumnsHelper.cxx b/connectivity/source/commontools/TColumnsHelper.cxx index 6cf821be8110..1b13ea4a2d62 100644 --- a/connectivity/source/commontools/TColumnsHelper.cxx +++ b/connectivity/source/commontools/TColumnsHelper.cxx @@ -151,7 +151,7 @@ sdbcx::ObjectType OColumnsHelper::createObject(const OUString& _rName) } -void OColumnsHelper::impl_refresh() throw(RuntimeException) +void OColumnsHelper::impl_refresh() { if ( m_pTable ) { diff --git a/connectivity/source/commontools/TConnection.cxx b/connectivity/source/commontools/TConnection.cxx index 7e34c98116d0..6853a69fac63 100644 --- a/connectivity/source/commontools/TConnection.cxx +++ b/connectivity/source/commontools/TConnection.cxx @@ -56,7 +56,7 @@ void OMetaConnection::disposing() m_aStatements.clear(); } //XUnoTunnel -sal_Int64 SAL_CALL OMetaConnection::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw (css::uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL OMetaConnection::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) { return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) ? reinterpret_cast< sal_Int64 >( this ) diff --git a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx index 4d8b74d7a583..d8d426b1182d 100644 --- a/connectivity/source/commontools/TDatabaseMetaDataBase.cxx +++ b/connectivity/source/commontools/TDatabaseMetaDataBase.cxx @@ -68,20 +68,20 @@ ODatabaseMetaDataBase::~ODatabaseMetaDataBase() } -Sequence< PropertyValue > SAL_CALL ODatabaseMetaDataBase::getConnectionInfo( ) throw (RuntimeException, std::exception) +Sequence< PropertyValue > SAL_CALL ODatabaseMetaDataBase::getConnectionInfo( ) { return m_aConnectionInfo; } -void SAL_CALL ODatabaseMetaDataBase::disposing( const EventObject& /*Source*/ ) throw(RuntimeException, std::exception) +void SAL_CALL ODatabaseMetaDataBase::disposing( const EventObject& /*Source*/ ) { // cut off all references to the connection m_xConnection.clear(); m_xListenerHelper.clear(); } -Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo( ) { ::osl::MutexGuard aGuard( m_aMutex ); if ( m_aTypeInfoRows.empty() ) @@ -169,33 +169,33 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTypeInfo( ) throw(SQ } Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getExportedKeys( - const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ ) throw(SQLException, RuntimeException, std::exception) + const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eExportedKeys ); } Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getImportedKeys( - const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ ) throw(SQLException, RuntimeException, std::exception) + const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eImportedKeys ); } Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getPrimaryKeys( - const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ ) throw(SQLException, RuntimeException, std::exception) + const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::ePrimaryKeys ); } Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getIndexInfo( const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/, - sal_Bool /*unique*/, sal_Bool /*approximate*/ ) throw(SQLException, RuntimeException, std::exception) + sal_Bool /*unique*/, sal_Bool /*approximate*/ ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eIndexInfo ); } Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getBestRowIdentifier( const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/, sal_Int32 /*scope*/, - sal_Bool /*nullable*/ ) throw(SQLException, RuntimeException, std::exception) + sal_Bool /*nullable*/ ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eBestRowIdentifier ); } @@ -203,120 +203,120 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getBestRowIdentifier( Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getCrossReference( const Any& /*primaryCatalog*/, const OUString& /*primarySchema*/, const OUString& /*primaryTable*/, const Any& /*foreignCatalog*/, - const OUString& /*foreignSchema*/, const OUString& /*foreignTable*/ ) throw(SQLException, RuntimeException, std::exception) + const OUString& /*foreignSchema*/, const OUString& /*foreignTable*/ ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eCrossReference ); } -Reference< XConnection > SAL_CALL ODatabaseMetaDataBase::getConnection( ) throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > SAL_CALL ODatabaseMetaDataBase::getConnection( ) { return m_xConnection; } Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getProcedureColumns( const Any& /*catalog*/, const OUString& /*schemaPattern*/, - const OUString& /*procedureNamePattern*/, const OUString& /*columnNamePattern*/ ) throw(SQLException, RuntimeException, std::exception) + const OUString& /*procedureNamePattern*/, const OUString& /*columnNamePattern*/ ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedureColumns ); } Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getProcedures( const Any& /*catalog*/, const OUString& /*schemaPattern*/, - const OUString& /*procedureNamePattern*/ ) throw(SQLException, RuntimeException, std::exception) + const OUString& /*procedureNamePattern*/ ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedures ); } Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getVersionColumns( - const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ ) throw(SQLException, RuntimeException, std::exception) + const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/ ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eVersionColumns ); } -Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getSchemas( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getSchemas( ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eSchemas ); } Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getColumnPrivileges( const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/, - const OUString& /*columnNamePattern*/ ) throw(SQLException, RuntimeException, std::exception) + const OUString& /*columnNamePattern*/ ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eColumnPrivileges ); } Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getTablePrivileges( - const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/) throw(SQLException, RuntimeException, std::exception) + const Any& /*catalog*/, const OUString& /*schema*/, const OUString& /*table*/) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eTablePrivileges ); } -Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getCatalogs( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL ODatabaseMetaDataBase::getCatalogs( ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eCatalogs ); } -OUString SAL_CALL ODatabaseMetaDataBase::getIdentifierQuoteString( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaDataBase::getIdentifierQuoteString( ) { return callImplMethod(m_sIdentifierQuoteString,::std::mem_fun_t< OUString ,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getIdentifierQuoteString_throw)); } -sal_Bool SAL_CALL ODatabaseMetaDataBase::isCatalogAtStart( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataBase::isCatalogAtStart( ) { return callImplMethod(m_isCatalogAtStart,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_isCatalogAtStart_throw)); } -OUString SAL_CALL ODatabaseMetaDataBase::getCatalogSeparator( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaDataBase::getCatalogSeparator( ) { return callImplMethod(m_sCatalogSeparator,::std::mem_fun_t< OUString,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getCatalogSeparator_throw)); } -sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsCatalogsInTableDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsCatalogsInTableDefinitions( ) { return callImplMethod(m_supportsCatalogsInTableDefinitions,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsCatalogsInTableDefinitions_throw)); } -sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsSchemasInTableDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsSchemasInTableDefinitions( ) { return callImplMethod(m_supportsSchemasInTableDefinitions,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsSchemasInTableDefinitions_throw)); } -sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsCatalogsInDataManipulation( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsCatalogsInDataManipulation( ) { return callImplMethod(m_supportsCatalogsInDataManipulation,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsCatalogsInDataManipulation_throw)); } -sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsSchemasInDataManipulation( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsSchemasInDataManipulation( ) { return callImplMethod(m_supportsSchemasInDataManipulation,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsSchemasInDataManipulation_throw)); } -sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsMixedCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsMixedCaseQuotedIdentifiers( ) { return callImplMethod(m_supportsMixedCaseQuotedIdentifiers,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsMixedCaseQuotedIdentifiers_throw)); } -sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsAlterTableWithAddColumn( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsAlterTableWithAddColumn( ) { return callImplMethod(m_supportsAlterTableWithAddColumn,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsAlterTableWithAddColumn_throw)); } -sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsAlterTableWithDropColumn( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataBase::supportsAlterTableWithDropColumn( ) { return callImplMethod(m_supportsAlterTableWithDropColumn,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_supportsAlterTableWithDropColumn_throw)); } -sal_Int32 SAL_CALL ODatabaseMetaDataBase::getMaxStatements( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaDataBase::getMaxStatements( ) { return callImplMethod(m_MaxStatements,::std::mem_fun_t< sal_Int32,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getMaxStatements_throw)); } -sal_Int32 SAL_CALL ODatabaseMetaDataBase::getMaxTablesInSelect( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaDataBase::getMaxTablesInSelect( ) { return callImplMethod(m_MaxTablesInSelect,::std::mem_fun_t< sal_Int32,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_getMaxTablesInSelect_throw)); } -sal_Bool SAL_CALL ODatabaseMetaDataBase::storesMixedCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataBase::storesMixedCaseQuotedIdentifiers( ) { return callImplMethod(m_storesMixedCaseQuotedIdentifiers,::std::mem_fun_t< bool,ODatabaseMetaDataBase>(&ODatabaseMetaDataBase::impl_storesMixedCaseQuotedIdentifiers_throw)); } diff --git a/connectivity/source/commontools/TIndexColumns.cxx b/connectivity/source/commontools/TIndexColumns.cxx index 4aa37e197144..3d19c026ec1d 100644 --- a/connectivity/source/commontools/TIndexColumns.cxx +++ b/connectivity/source/commontools/TIndexColumns.cxx @@ -110,7 +110,7 @@ Reference< XPropertySet > OIndexColumns::createDescriptor() return new OIndexColumn(true); } -void OIndexColumns::impl_refresh() throw(RuntimeException) +void OIndexColumns::impl_refresh() { m_pIndex->refreshColumns(); } diff --git a/connectivity/source/commontools/TIndexes.cxx b/connectivity/source/commontools/TIndexes.cxx index 81858e3c433b..66a7ccb6078d 100644 --- a/connectivity/source/commontools/TIndexes.cxx +++ b/connectivity/source/commontools/TIndexes.cxx @@ -110,7 +110,7 @@ sdbcx::ObjectType OIndexesHelper::createObject(const OUString& _rName) return xRet; } -void OIndexesHelper::impl_refresh() throw(RuntimeException) +void OIndexesHelper::impl_refresh() { m_pTable->refreshIndexes(); } diff --git a/connectivity/source/commontools/TKeyColumns.cxx b/connectivity/source/commontools/TKeyColumns.cxx index 6a71ff72088f..423529da466a 100644 --- a/connectivity/source/commontools/TKeyColumns.cxx +++ b/connectivity/source/commontools/TKeyColumns.cxx @@ -126,7 +126,7 @@ Reference< XPropertySet > OKeyColumnsHelper::createDescriptor() return new OKeyColumn(isCaseSensitive()); } -void OKeyColumnsHelper::impl_refresh() throw(css::uno::RuntimeException) +void OKeyColumnsHelper::impl_refresh() { m_pKey->refreshColumns(); } diff --git a/connectivity/source/commontools/TKeys.cxx b/connectivity/source/commontools/TKeys.cxx index 03ddf7e2ca66..e9834d080387 100644 --- a/connectivity/source/commontools/TKeys.cxx +++ b/connectivity/source/commontools/TKeys.cxx @@ -68,7 +68,7 @@ sdbcx::ObjectType OKeysHelper::createObject(const OUString& _rName) return xRet; } -void OKeysHelper::impl_refresh() throw(RuntimeException) +void OKeysHelper::impl_refresh() { m_pTable->refreshKeys(); } diff --git a/connectivity/source/commontools/TPrivilegesResultSet.cxx b/connectivity/source/commontools/TPrivilegesResultSet.cxx index 96d1732f8c04..2d5e142d8eb2 100644 --- a/connectivity/source/commontools/TPrivilegesResultSet.cxx +++ b/connectivity/source/commontools/TPrivilegesResultSet.cxx @@ -114,7 +114,7 @@ m_xTables.clear(); m_xRow.clear(); } -sal_Bool SAL_CALL OResultSetPrivileges::next( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetPrivileges::next( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed ); diff --git a/connectivity/source/commontools/TTableHelper.cxx b/connectivity/source/commontools/TTableHelper.cxx index f6a45d4bacc1..7d20c75e7573 100644 --- a/connectivity/source/commontools/TTableHelper.cxx +++ b/connectivity/source/commontools/TTableHelper.cxx @@ -66,17 +66,17 @@ public: // noncopyable OTableContainerListener(const OTableContainerListener&) = delete; const OTableContainerListener& operator=(const OTableContainerListener&) = delete; - virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& /*Event*/ ) throw (RuntimeException, std::exception) override + virtual void SAL_CALL elementInserted( const css::container::ContainerEvent& /*Event*/ ) override { } - virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) throw (RuntimeException, std::exception) override + virtual void SAL_CALL elementRemoved( const css::container::ContainerEvent& Event ) override { OUString sName; Event.Accessor >>= sName; if ( m_aRefNames.find(sName) != m_aRefNames.end() ) m_pComponent->refreshKeys(); } - virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) throw (RuntimeException, std::exception) override + virtual void SAL_CALL elementReplaced( const css::container::ContainerEvent& Event ) override { OUString sOldComposedName,sNewComposedName; Event.ReplacedElement >>= sOldComposedName; @@ -85,7 +85,7 @@ public: m_pComponent->refreshKeys(); } // XEventListener - virtual void SAL_CALL disposing( const EventObject& /*_rSource*/ ) throw (RuntimeException, std::exception) override + virtual void SAL_CALL disposing( const EventObject& /*_rSource*/ ) override { } void clear() { m_pComponent = nullptr; } @@ -492,7 +492,7 @@ OUString OTableHelper::getRenameStart() const } // XRename -void SAL_CALL OTableHelper::rename( const OUString& newName ) throw(SQLException, ElementExistException, RuntimeException, std::exception) +void SAL_CALL OTableHelper::rename( const OUString& newName ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed( @@ -542,7 +542,7 @@ Reference< XDatabaseMetaData> OTableHelper::getMetaData() const return m_pImpl->m_xMetaData; } -void SAL_CALL OTableHelper::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor ) throw(SQLException, css::lang::IndexOutOfBoundsException, RuntimeException, std::exception) +void SAL_CALL OTableHelper::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed( @@ -560,7 +560,7 @@ void SAL_CALL OTableHelper::alterColumnByIndex( sal_Int32 index, const Reference } -OUString SAL_CALL OTableHelper::getName() throw(RuntimeException, std::exception) +OUString SAL_CALL OTableHelper::getName() { OUString sComposedName; sComposedName = ::dbtools::composeTableName(getMetaData(),m_CatalogName,m_SchemaName,m_Name,false,::dbtools::EComposeRule::InDataManipulation); diff --git a/connectivity/source/commontools/conncleanup.cxx b/connectivity/source/commontools/conncleanup.cxx index 5db4fbe0d518..03133dcf23e5 100644 --- a/connectivity/source/commontools/conncleanup.cxx +++ b/connectivity/source/commontools/conncleanup.cxx @@ -124,7 +124,7 @@ namespace dbtools } - void SAL_CALL OAutoConnectionDisposer::propertyChange( const PropertyChangeEvent& _rEvent ) throw (RuntimeException, std::exception) + void SAL_CALL OAutoConnectionDisposer::propertyChange( const PropertyChangeEvent& _rEvent ) { if ( _rEvent.PropertyName == ACTIVE_CONNECTION_PROPERTY_NAME ) { // somebody set a new ActiveConnection @@ -176,7 +176,7 @@ namespace dbtools } - void SAL_CALL OAutoConnectionDisposer::disposing( const EventObject& _rSource ) throw (RuntimeException, std::exception) + void SAL_CALL OAutoConnectionDisposer::disposing( const EventObject& _rSource ) { // the rowset is being disposed, and nobody has set a new ActiveConnection in the meantime if ( isRowSetListening() ) @@ -204,15 +204,15 @@ namespace dbtools } } - void SAL_CALL OAutoConnectionDisposer::cursorMoved( const css::lang::EventObject& /*event*/ ) throw (css::uno::RuntimeException, std::exception) + void SAL_CALL OAutoConnectionDisposer::cursorMoved( const css::lang::EventObject& /*event*/ ) { } - void SAL_CALL OAutoConnectionDisposer::rowChanged( const css::lang::EventObject& /*event*/ ) throw (css::uno::RuntimeException, std::exception) + void SAL_CALL OAutoConnectionDisposer::rowChanged( const css::lang::EventObject& /*event*/ ) { } - void SAL_CALL OAutoConnectionDisposer::rowSetChanged( const css::lang::EventObject& /*event*/ ) throw (css::uno::RuntimeException, std::exception) + void SAL_CALL OAutoConnectionDisposer::rowSetChanged( const css::lang::EventObject& /*event*/ ) { stopRowSetListening(); clearConnection(); diff --git a/connectivity/source/commontools/dbexception.cxx b/connectivity/source/commontools/dbexception.cxx index 133c543510cc..046b7537fe6e 100644 --- a/connectivity/source/commontools/dbexception.cxx +++ b/connectivity/source/commontools/dbexception.cxx @@ -344,7 +344,7 @@ void SQLExceptionIteratorHelper::next( SQLExceptionInfo& _out_rInfo ) } -void throwFunctionSequenceException(const Reference< XInterface >& Context, const Any& Next) throw ( css::sdbc::SQLException ) +void throwFunctionSequenceException(const Reference< XInterface >& Context, const Any& Next) { ::connectivity::SharedResources aResources; throw SQLException( @@ -357,7 +357,7 @@ void throwFunctionSequenceException(const Reference< XInterface >& Context, cons } void throwInvalidIndexException(const css::uno::Reference< css::uno::XInterface >& Context, - const css::uno::Any& Next) throw ( css::sdbc::SQLException ) + const css::uno::Any& Next) { ::connectivity::SharedResources aResources; throw SQLException( @@ -370,7 +370,7 @@ void throwInvalidIndexException(const css::uno::Reference< css::uno::XInterface } void throwFunctionNotSupportedSQLException(const OUString& _rFunctionName, - const css::uno::Reference& _rxContext) throw (css::sdbc::SQLException) + const css::uno::Reference& _rxContext) { ::connectivity::SharedResources aResources; const OUString sError( aResources.getResourceStringWithSubstitution( @@ -387,7 +387,7 @@ void throwFunctionNotSupportedSQLException(const OUString& _rFunctionName, } void throwFunctionNotSupportedRuntimeException(const OUString& _rFunctionName, - const css::uno::Reference& _rxContext) throw (css::uno::RuntimeException) + const css::uno::Reference& _rxContext) { ::connectivity::SharedResources aResources; const OUString sError( aResources.getResourceStringWithSubstitution( @@ -401,20 +401,17 @@ void throwFunctionNotSupportedRuntimeException(const OUString& _rFunctionName, } void throwGenericSQLException(const OUString& _rMsg, const css::uno::Reference< css::uno::XInterface >& _rxSource) - throw (css::sdbc::SQLException) { throwGenericSQLException(_rMsg, _rxSource, Any()); } void throwGenericSQLException(const OUString& _rMsg, const Reference< XInterface >& _rxSource, const Any& _rNextException) - throw (SQLException) { throw SQLException( _rMsg, _rxSource, getStandardSQLState( StandardSQLState::GENERAL_ERROR ), 0, _rNextException); } void throwFeatureNotImplementedSQLException( const OUString& _rFeatureName, const Reference< XInterface >& _rxContext ) - throw (SQLException) { ::connectivity::SharedResources aResources; const OUString sError( aResources.getResourceStringWithSubstitution( @@ -432,7 +429,6 @@ void throwFeatureNotImplementedSQLException( const OUString& _rFeatureName, cons } void throwFeatureNotImplementedRuntimeException(const OUString& _rFeatureName, const Reference< XInterface >& _rxContext) - throw (RuntimeException) { ::connectivity::SharedResources aResources; const OUString sError( aResources.getResourceStringWithSubstitution( @@ -444,7 +440,6 @@ void throwFeatureNotImplementedRuntimeException(const OUString& _rFeatureName, c } void throwInvalidColumnException( const OUString& _rColumnName, const Reference< XInterface >& _rxContext) - throw (SQLException) { ::connectivity::SharedResources aResources; OUString sErrorMessage( aResources.getResourceStringWithSubstitution( @@ -454,7 +449,7 @@ void throwInvalidColumnException( const OUString& _rColumnName, const Reference< } void throwSQLException( const OUString& _rMessage, const OUString& _rSQLState, - const Reference< XInterface >& _rxContext, const sal_Int32 _nErrorCode, const Any* _pNextException ) throw (SQLException) + const Reference< XInterface >& _rxContext, const sal_Int32 _nErrorCode, const Any* _pNextException ) { throw SQLException( _rMessage, @@ -467,7 +462,7 @@ void throwSQLException( const OUString& _rMessage, const OUString& _rSQLState, void throwSQLException( const OUString& _rMessage, StandardSQLState _eSQLState, - const Reference< XInterface >& _rxContext, const sal_Int32 _nErrorCode ) throw (SQLException) + const Reference< XInterface >& _rxContext, const sal_Int32 _nErrorCode ) { throwSQLException( _rMessage, getStandardSQLState( _eSQLState ), _rxContext, _nErrorCode ); } diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx index 0f4b0ad8a02e..94c9eaf3ecb6 100644 --- a/connectivity/source/commontools/dbtools.cxx +++ b/connectivity/source/commontools/dbtools.cxx @@ -329,7 +329,7 @@ Reference< XConnection> getConnection_withFeedback(const OUString& _rDataSourceN return xReturn; } -Reference< XConnection> getConnection(const Reference< XRowSet>& _rxRowSet) throw (RuntimeException) +Reference< XConnection> getConnection(const Reference< XRowSet>& _rxRowSet) { Reference< XConnection> xReturn; Reference< XPropertySet> xRowSetProps(_rxRowSet, UNO_QUERY); @@ -1635,24 +1635,24 @@ namespace OParameterWrapper(const ::std::vector >& _aSet,const Reference& _xSource) : m_aSet(_aSet),m_xSource(_xSource){} private: // css::container::XElementAccess - virtual Type SAL_CALL getElementType() throw(RuntimeException, std::exception) override + virtual Type SAL_CALL getElementType() override { return m_xSource->getElementType(); } - virtual sal_Bool SAL_CALL hasElements( ) throw(RuntimeException, std::exception) override + virtual sal_Bool SAL_CALL hasElements( ) override { if ( m_aSet.empty() ) return m_xSource->hasElements(); return ::std::count(m_aSet.begin(),m_aSet.end(),false) != 0; } // css::container::XIndexAccess - virtual sal_Int32 SAL_CALL getCount( ) throw(RuntimeException, std::exception) override + virtual sal_Int32 SAL_CALL getCount( ) override { if ( m_aSet.empty() ) return m_xSource->getCount(); return ::std::count(m_aSet.begin(),m_aSet.end(),false); } - virtual Any SAL_CALL getByIndex( sal_Int32 Index ) throw(IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception) override + virtual Any SAL_CALL getByIndex( sal_Int32 Index ) override { if ( m_aSet.empty() ) return m_xSource->getByIndex(Index); @@ -1775,7 +1775,7 @@ void setObjectWithInfo(const Reference& _xParams, sal_Int32 parameterIndex, const Any& x, sal_Int32 sqlType, - sal_Int32 scale) throw(SQLException, RuntimeException, std::exception) + sal_Int32 scale) { ORowSetValue aVal; aVal.fill(x); @@ -1786,7 +1786,7 @@ void setObjectWithInfo(const Reference& _xParams, sal_Int32 parameterIndex, const ::connectivity::ORowSetValue& _rValue, sal_Int32 sqlType, - sal_Int32 scale) throw(SQLException, RuntimeException, std::exception) + sal_Int32 scale) { if ( _rValue.isNull() ) _xParams->setNull(parameterIndex,sqlType); @@ -2000,7 +2000,7 @@ void release(oslInterlockedCount& _refCount, osl_atomic_increment( &_refCount ); } -void checkDisposed(bool _bThrow) throw ( DisposedException ) +void checkDisposed(bool _bThrow) { if (_bThrow) throw DisposedException(); diff --git a/connectivity/source/commontools/parameters.cxx b/connectivity/source/commontools/parameters.cxx index 32c2cc0a520a..ad3bf0338f15 100644 --- a/connectivity/source/commontools/parameters.cxx +++ b/connectivity/source/commontools/parameters.cxx @@ -1096,7 +1096,7 @@ namespace dbtools m_xInnerParamUpdate->clearParameters( ); } - void SAL_CALL OParameterContinuation::setParameters( const Sequence< PropertyValue >& _rValues ) throw( RuntimeException, std::exception ) + void SAL_CALL OParameterContinuation::setParameters( const Sequence< PropertyValue >& _rValues ) { m_aValues = _rValues; } diff --git a/connectivity/source/commontools/paramwrapper.cxx b/connectivity/source/commontools/paramwrapper.cxx index 72e91a977e76..1f2466ca3774 100644 --- a/connectivity/source/commontools/paramwrapper.cxx +++ b/connectivity/source/commontools/paramwrapper.cxx @@ -97,7 +97,6 @@ namespace param IMPLEMENT_FORWARD_REFCOUNT( ParameterWrapper, UnoBase ) css::uno::Any ParameterWrapper::queryInterface(css::uno::Type const & aType) - throw (css::uno::RuntimeException, std::exception) { css::uno::Any a(UnoBase::queryInterface(aType)); if (!a.hasValue()) { @@ -112,7 +111,7 @@ namespace param } - Sequence< Type > SAL_CALL ParameterWrapper::getTypes( ) throw(RuntimeException, std::exception) + Sequence< Type > SAL_CALL ParameterWrapper::getTypes( ) { Sequence< Type > aTypes( 5 ); aTypes[ 0 ] = cppu::UnoType::get(); @@ -143,7 +142,7 @@ namespace param } - Reference< XPropertySetInfo > ParameterWrapper::getPropertySetInfo() throw( RuntimeException, std::exception ) + Reference< XPropertySetInfo > ParameterWrapper::getPropertySetInfo() { return createPropertySetInfo( getInfoHelper() ); } @@ -177,7 +176,7 @@ namespace param } - sal_Bool ParameterWrapper::convertFastPropertyValue(Any& rConvertedValue, Any& rOldValue, sal_Int32 nHandle, const Any& rValue) throw( IllegalArgumentException ) + sal_Bool ParameterWrapper::convertFastPropertyValue(Any& rConvertedValue, Any& rOldValue, sal_Int32 nHandle, const Any& rValue) { OSL_ENSURE( PROPERTY_ID_VALUE == nHandle, "ParameterWrapper::convertFastPropertyValue: the only non-readonly prop should be our PROPERTY_VALUE!" ); (void)nHandle; @@ -189,7 +188,7 @@ namespace param } - void ParameterWrapper::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) throw( Exception, std::exception ) + void ParameterWrapper::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) { if ( nHandle == PROPERTY_ID_VALUE ) { @@ -283,7 +282,7 @@ namespace param } - Type SAL_CALL ParameterWrapperContainer::getElementType() throw( RuntimeException, std::exception ) + Type SAL_CALL ParameterWrapperContainer::getElementType() { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -291,7 +290,7 @@ namespace param } - sal_Bool SAL_CALL ParameterWrapperContainer::hasElements() throw( RuntimeException, std::exception ) + sal_Bool SAL_CALL ParameterWrapperContainer::hasElements() { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -299,7 +298,7 @@ namespace param } - sal_Int32 SAL_CALL ParameterWrapperContainer::getCount() throw( RuntimeException, std::exception ) + sal_Int32 SAL_CALL ParameterWrapperContainer::getCount() { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -307,7 +306,7 @@ namespace param } - Any SAL_CALL ParameterWrapperContainer::getByIndex( sal_Int32 _nIndex ) throw( IndexOutOfBoundsException, WrappedTargetException, RuntimeException, std::exception ) + Any SAL_CALL ParameterWrapperContainer::getByIndex( sal_Int32 _nIndex ) { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); @@ -319,7 +318,7 @@ namespace param } - Reference< XEnumeration > ParameterWrapperContainer::createEnumeration() throw( RuntimeException, std::exception ) + Reference< XEnumeration > ParameterWrapperContainer::createEnumeration() { ::osl::MutexGuard aGuard( m_aMutex ); impl_checkDisposed_throw(); diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx index 68fde8a548dc..a350993bd0e0 100644 --- a/connectivity/source/cpool/ZConnectionPool.cxx +++ b/connectivity/source/cpool/ZConnectionPool.cxx @@ -152,7 +152,7 @@ m_xDriverNode.clear(); m_xDriver.clear(); } -Reference< XConnection > SAL_CALL OConnectionPool::getConnectionWithInfo( const OUString& _rURL, const Sequence< PropertyValue >& _rInfo ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL OConnectionPool::getConnectionWithInfo( const OUString& _rURL, const Sequence< PropertyValue >& _rInfo ) { MutexGuard aGuard(m_aMutex); @@ -173,7 +173,7 @@ Reference< XConnection > SAL_CALL OConnectionPool::getConnectionWithInfo( const return xConnection; } -void SAL_CALL OConnectionPool::disposing( const css::lang::EventObject& Source ) throw (RuntimeException, std::exception) +void SAL_CALL OConnectionPool::disposing( const css::lang::EventObject& Source ) { Reference xConnection(Source.Source,UNO_QUERY); if(xConnection.is()) @@ -285,7 +285,7 @@ Reference< XConnection> OConnectionPool::getPooledConnection(TConnectionMap::ite return xConnection; } -void SAL_CALL OConnectionPool::propertyChange( const PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) +void SAL_CALL OConnectionPool::propertyChange( const PropertyChangeEvent& evt ) { if(TIMEOUT_NODENAME == evt.PropertyName) { diff --git a/connectivity/source/cpool/ZConnectionPool.hxx b/connectivity/source/cpool/ZConnectionPool.hxx index e598adbd3b0f..3430ee23c76c 100644 --- a/connectivity/source/cpool/ZConnectionPool.hxx +++ b/connectivity/source/cpool/ZConnectionPool.hxx @@ -139,11 +139,11 @@ namespace connectivity void clear(bool _bDispose); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnectionWithInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException); + css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnectionWithInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ); // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) override; void invalidatePooledConnections(); }; diff --git a/connectivity/source/cpool/ZConnectionWrapper.cxx b/connectivity/source/cpool/ZConnectionWrapper.cxx index d61c18fbfcd8..4b1157afa39e 100644 --- a/connectivity/source/cpool/ZConnectionWrapper.cxx +++ b/connectivity/source/cpool/ZConnectionWrapper.cxx @@ -52,7 +52,7 @@ OConnectionWeakWrapper::~OConnectionWeakWrapper() IMPLEMENT_SERVICE_INFO(OConnectionWeakWrapper, "com.sun.star.sdbc.drivers.OConnectionWeakWrapper", "com.sun.star.sdbc.Connection") -Reference< XStatement > SAL_CALL OConnectionWeakWrapper::createStatement( ) throw(SQLException, RuntimeException, std::exception) +Reference< XStatement > SAL_CALL OConnectionWeakWrapper::createStatement( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); @@ -61,7 +61,7 @@ Reference< XStatement > SAL_CALL OConnectionWeakWrapper::createStatement( ) thr return m_xConnection->createStatement(); } -Reference< XPreparedStatement > SAL_CALL OConnectionWeakWrapper::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +Reference< XPreparedStatement > SAL_CALL OConnectionWeakWrapper::prepareStatement( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); @@ -70,7 +70,7 @@ Reference< XPreparedStatement > SAL_CALL OConnectionWeakWrapper::prepareStatemen return m_xConnection->prepareStatement(sql); } -Reference< XPreparedStatement > SAL_CALL OConnectionWeakWrapper::prepareCall( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +Reference< XPreparedStatement > SAL_CALL OConnectionWeakWrapper::prepareCall( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); @@ -79,7 +79,7 @@ Reference< XPreparedStatement > SAL_CALL OConnectionWeakWrapper::prepareCall( co return m_xConnection->prepareCall(sql); } -OUString SAL_CALL OConnectionWeakWrapper::nativeSQL( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OConnectionWeakWrapper::nativeSQL( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); @@ -88,7 +88,7 @@ OUString SAL_CALL OConnectionWeakWrapper::nativeSQL( const OUString& sql ) throw return m_xConnection->nativeSQL(sql); } -void SAL_CALL OConnectionWeakWrapper::setAutoCommit( sal_Bool autoCommit ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnectionWeakWrapper::setAutoCommit( sal_Bool autoCommit ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); @@ -96,7 +96,7 @@ void SAL_CALL OConnectionWeakWrapper::setAutoCommit( sal_Bool autoCommit ) throw m_xConnection->setAutoCommit(autoCommit); } -sal_Bool SAL_CALL OConnectionWeakWrapper::getAutoCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OConnectionWeakWrapper::getAutoCommit( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); @@ -105,7 +105,7 @@ sal_Bool SAL_CALL OConnectionWeakWrapper::getAutoCommit( ) throw(SQLException, return m_xConnection->getAutoCommit(); } -void SAL_CALL OConnectionWeakWrapper::commit( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnectionWeakWrapper::commit( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); @@ -114,7 +114,7 @@ void SAL_CALL OConnectionWeakWrapper::commit( ) throw(SQLException, RuntimeExce m_xConnection->commit(); } -void SAL_CALL OConnectionWeakWrapper::rollback( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnectionWeakWrapper::rollback( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); @@ -123,14 +123,14 @@ void SAL_CALL OConnectionWeakWrapper::rollback( ) throw(SQLException, RuntimeEx m_xConnection->rollback(); } -sal_Bool SAL_CALL OConnectionWeakWrapper::isClosed( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OConnectionWeakWrapper::isClosed( ) { ::osl::MutexGuard aGuard( m_aMutex ); return m_xConnection->isClosed(); } -Reference< XDatabaseMetaData > SAL_CALL OConnectionWeakWrapper::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XDatabaseMetaData > SAL_CALL OConnectionWeakWrapper::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); @@ -139,7 +139,7 @@ Reference< XDatabaseMetaData > SAL_CALL OConnectionWeakWrapper::getMetaData( ) return m_xConnection->getMetaData(); } -void SAL_CALL OConnectionWeakWrapper::setReadOnly( sal_Bool readOnly ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnectionWeakWrapper::setReadOnly( sal_Bool readOnly ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); @@ -148,7 +148,7 @@ void SAL_CALL OConnectionWeakWrapper::setReadOnly( sal_Bool readOnly ) throw(SQL m_xConnection->setReadOnly(readOnly); } -sal_Bool SAL_CALL OConnectionWeakWrapper::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OConnectionWeakWrapper::isReadOnly( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); @@ -157,7 +157,7 @@ sal_Bool SAL_CALL OConnectionWeakWrapper::isReadOnly( ) throw(SQLException, Run return m_xConnection->isReadOnly(); } -void SAL_CALL OConnectionWeakWrapper::setCatalog( const OUString& catalog ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnectionWeakWrapper::setCatalog( const OUString& catalog ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); @@ -166,7 +166,7 @@ void SAL_CALL OConnectionWeakWrapper::setCatalog( const OUString& catalog ) thro m_xConnection->setCatalog(catalog); } -OUString SAL_CALL OConnectionWeakWrapper::getCatalog( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OConnectionWeakWrapper::getCatalog( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); @@ -175,7 +175,7 @@ OUString SAL_CALL OConnectionWeakWrapper::getCatalog( ) throw(SQLException, Run return m_xConnection->getCatalog(); } -void SAL_CALL OConnectionWeakWrapper::setTransactionIsolation( sal_Int32 level ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnectionWeakWrapper::setTransactionIsolation( sal_Int32 level ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); @@ -184,7 +184,7 @@ void SAL_CALL OConnectionWeakWrapper::setTransactionIsolation( sal_Int32 level ) m_xConnection->setTransactionIsolation(level); } -sal_Int32 SAL_CALL OConnectionWeakWrapper::getTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OConnectionWeakWrapper::getTransactionIsolation( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); @@ -193,7 +193,7 @@ sal_Int32 SAL_CALL OConnectionWeakWrapper::getTransactionIsolation( ) throw(SQL return m_xConnection->getTransactionIsolation(); } -Reference< css::container::XNameAccess > SAL_CALL OConnectionWeakWrapper::getTypeMap( ) throw(SQLException, RuntimeException, std::exception) +Reference< css::container::XNameAccess > SAL_CALL OConnectionWeakWrapper::getTypeMap( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); @@ -202,7 +202,7 @@ Reference< css::container::XNameAccess > SAL_CALL OConnectionWeakWrapper::getTyp return m_xConnection->getTypeMap(); } -void SAL_CALL OConnectionWeakWrapper::setTypeMap( const Reference< css::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnectionWeakWrapper::setTypeMap( const Reference< css::container::XNameAccess >& typeMap ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnectionWeakWrapper_BASE::rBHelper.bDisposed); @@ -212,7 +212,7 @@ void SAL_CALL OConnectionWeakWrapper::setTypeMap( const Reference< css::containe } // XCloseable -void SAL_CALL OConnectionWeakWrapper::close( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnectionWeakWrapper::close( ) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -233,7 +233,7 @@ void OConnectionWeakWrapper::disposing() // css::lang::XUnoTunnel IMPLEMENT_FORWARD_REFCOUNT( OConnectionWeakWrapper, OConnectionWeakWrapper_BASE ) -css::uno::Any SAL_CALL OConnectionWeakWrapper::queryInterface( const css::uno::Type& _rType ) throw (css::uno::RuntimeException, std::exception) +css::uno::Any SAL_CALL OConnectionWeakWrapper::queryInterface( const css::uno::Type& _rType ) { css::uno::Any aReturn = OConnectionWeakWrapper_BASE::queryInterface( _rType ); if ( !aReturn.hasValue() ) diff --git a/connectivity/source/cpool/ZConnectionWrapper.hxx b/connectivity/source/cpool/ZConnectionWrapper.hxx index 7ce68a9a60ad..b74fb244662c 100644 --- a/connectivity/source/cpool/ZConnectionWrapper.hxx +++ b/connectivity/source/cpool/ZConnectionWrapper.hxx @@ -52,26 +52,26 @@ namespace connectivity DECLARE_XINTERFACE( ) // XConnection - virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getAutoCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL commit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL rollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isClosed( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCatalog( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) override; + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) override; + virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) override; + virtual sal_Bool SAL_CALL getAutoCommit( ) override; + virtual void SAL_CALL commit( ) override; + virtual void SAL_CALL rollback( ) override; + virtual sal_Bool SAL_CALL isClosed( ) override; + virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) override; + virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) override; + virtual sal_Bool SAL_CALL isReadOnly( ) override; + virtual void SAL_CALL setCatalog( const OUString& catalog ) override; + virtual OUString SAL_CALL getCatalog( ) override; + virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) override; + virtual sal_Int32 SAL_CALL getTransactionIsolation( ) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) override; + virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; // XCloseable - virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) override; }; } #endif // INCLUDED_CONNECTIVITY_SOURCE_CPOOL_ZCONNECTIONWRAPPER_HXX diff --git a/connectivity/source/cpool/ZDriverWrapper.cxx b/connectivity/source/cpool/ZDriverWrapper.cxx index d9df6fcb3a9d..811f103bc9a6 100644 --- a/connectivity/source/cpool/ZDriverWrapper.cxx +++ b/connectivity/source/cpool/ZDriverWrapper.cxx @@ -61,14 +61,14 @@ namespace connectivity } - Any SAL_CALL ODriverWrapper::queryInterface( const Type& _rType ) throw (RuntimeException, std::exception) + Any SAL_CALL ODriverWrapper::queryInterface( const Type& _rType ) { Any aReturn = ODriverWrapper_BASE::queryInterface(_rType); return aReturn.hasValue() ? aReturn : (m_xDriverAggregate.is() ? m_xDriverAggregate->queryAggregation(_rType) : aReturn); } - Reference< XConnection > SAL_CALL ODriverWrapper::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException, std::exception) + Reference< XConnection > SAL_CALL ODriverWrapper::connect( const OUString& url, const Sequence< PropertyValue >& info ) { Reference< XConnection > xConnection; if (m_pConnectionPool.is()) @@ -81,13 +81,13 @@ namespace connectivity } - sal_Bool SAL_CALL ODriverWrapper::acceptsURL( const OUString& url ) throw (SQLException, RuntimeException, std::exception) + sal_Bool SAL_CALL ODriverWrapper::acceptsURL( const OUString& url ) { return m_xDriver.is() && m_xDriver->acceptsURL(url); } - Sequence< DriverPropertyInfo > SAL_CALL ODriverWrapper::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException, std::exception) + Sequence< DriverPropertyInfo > SAL_CALL ODriverWrapper::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& info ) { Sequence< DriverPropertyInfo > aInfo; if (m_xDriver.is()) @@ -96,13 +96,13 @@ namespace connectivity } - sal_Int32 SAL_CALL ODriverWrapper::getMajorVersion( ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL ODriverWrapper::getMajorVersion( ) { return m_xDriver.is() ? m_xDriver->getMajorVersion() : 0; } - sal_Int32 SAL_CALL ODriverWrapper::getMinorVersion( ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL ODriverWrapper::getMinorVersion( ) { return m_xDriver.is() ? m_xDriver->getMinorVersion() : 0; } diff --git a/connectivity/source/cpool/ZDriverWrapper.hxx b/connectivity/source/cpool/ZDriverWrapper.hxx index 0d183d110fd4..c9b1d8d9362c 100644 --- a/connectivity/source/cpool/ZDriverWrapper.hxx +++ b/connectivity/source/cpool/ZDriverWrapper.hxx @@ -57,17 +57,17 @@ namespace connectivity // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) override; protected: /// dtor virtual ~ODriverWrapper() override; // XDriver - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMajorVersion( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMinorVersion( ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override; + virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) override; + virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override; + virtual sal_Int32 SAL_CALL getMajorVersion( ) override; + virtual sal_Int32 SAL_CALL getMinorVersion( ) override; }; diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx index f502b5fdb2eb..e9983a151782 100644 --- a/connectivity/source/cpool/ZPoolCollection.cxx +++ b/connectivity/source/cpool/ZPoolCollection.cxx @@ -95,12 +95,12 @@ OPoolCollection::~OPoolCollection() clearConnectionPools(false); } -Reference< XConnection > SAL_CALL OPoolCollection::getConnection( const OUString& _rURL ) throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > SAL_CALL OPoolCollection::getConnection( const OUString& _rURL ) { return getConnectionWithInfo(_rURL,Sequence< PropertyValue >()); } -Reference< XConnection > SAL_CALL OPoolCollection::getConnectionWithInfo( const OUString& _rURL, const Sequence< PropertyValue >& _rInfo ) throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > SAL_CALL OPoolCollection::getConnectionWithInfo( const OUString& _rURL, const Sequence< PropertyValue >& _rInfo ) { MutexGuard aGuard(m_aMutex); Reference< XConnection > xConnection; @@ -120,30 +120,30 @@ Reference< XConnection > SAL_CALL OPoolCollection::getConnectionWithInfo( const return xConnection; } -void SAL_CALL OPoolCollection::setLoginTimeout( sal_Int32 seconds ) throw(RuntimeException, std::exception) +void SAL_CALL OPoolCollection::setLoginTimeout( sal_Int32 seconds ) { MutexGuard aGuard(m_aMutex); m_xManager->setLoginTimeout(seconds); } -sal_Int32 SAL_CALL OPoolCollection::getLoginTimeout( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL OPoolCollection::getLoginTimeout( ) { MutexGuard aGuard(m_aMutex); return m_xManager->getLoginTimeout(); } -OUString SAL_CALL OPoolCollection::getImplementationName( ) throw(RuntimeException, std::exception) +OUString SAL_CALL OPoolCollection::getImplementationName( ) { return getImplementationName_Static(); } -sal_Bool SAL_CALL OPoolCollection::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL OPoolCollection::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } -Sequence< OUString > SAL_CALL OPoolCollection::getSupportedServiceNames( ) throw(RuntimeException, std::exception) +Sequence< OUString > SAL_CALL OPoolCollection::getSupportedServiceNames( ) { return getSupportedServiceNames_Static(); } @@ -155,19 +155,19 @@ Reference< XInterface > SAL_CALL OPoolCollection::CreateInstance(const Reference } -OUString SAL_CALL OPoolCollection::getImplementationName_Static( ) throw(RuntimeException) +OUString SAL_CALL OPoolCollection::getImplementationName_Static( ) { return OUString("com.sun.star.sdbc.OConnectionPool"); } -Sequence< OUString > SAL_CALL OPoolCollection::getSupportedServiceNames_Static( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL OPoolCollection::getSupportedServiceNames_Static( ) { Sequence< OUString > aSupported { "com.sun.star.sdbc.ConnectionPool" }; return aSupported; } -Reference< XDriver > SAL_CALL OPoolCollection::getDriverByURL( const OUString& _rURL ) throw(RuntimeException, std::exception) +Reference< XDriver > SAL_CALL OPoolCollection::getDriverByURL( const OUString& _rURL ) { // returns the original driver when no connection pooling is enabled else it returns the proxy MutexGuard aGuard(m_aMutex); @@ -396,16 +396,16 @@ Any OPoolCollection::getNodeValue(const OUString& _rPath,const Reference& _xTreeNode)throw(); // XDriverManager - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( const OUString& url ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnectionWithInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLoginTimeout( sal_Int32 seconds ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getLoginTimeout( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( const OUString& url ) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnectionWithInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override; + virtual void SAL_CALL setLoginTimeout( sal_Int32 seconds ) override; + virtual sal_Int32 SAL_CALL getLoginTimeout( ) override; //XDriverAccess - virtual css::uno::Reference< css::sdbc::XDriver > SAL_CALL getDriverByURL( const OUString& url ) throw (css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XDriver > SAL_CALL getDriverByURL( const OUString& url ) override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XServiceInfo - static methods static css::uno::Reference< css::uno::XInterface > SAL_CALL CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >&); /// @throws css::uno::RuntimeException - static OUString SAL_CALL getImplementationName_Static( ) throw(css::uno::RuntimeException); + static OUString SAL_CALL getImplementationName_Static( ); /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(css::uno::RuntimeException); + static css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames_Static( ); // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; // XPropertyChangeListener - virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL propertyChange( const css::beans::PropertyChangeEvent& evt ) override; // XTerminateListener - virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) throw (css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) override; + virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) override; }; } #endif // INCLUDED_CONNECTIVITY_SOURCE_CPOOL_ZPOOLCOLLECTION_HXX diff --git a/connectivity/source/cpool/ZPooledConnection.cxx b/connectivity/source/cpool/ZPooledConnection.cxx index dc33e1765b94..c8fd83e39553 100644 --- a/connectivity/source/cpool/ZPooledConnection.cxx +++ b/connectivity/source/cpool/ZPooledConnection.cxx @@ -53,13 +53,13 @@ m_xComponent.clear(); } // XEventListener -void SAL_CALL OPooledConnection::disposing( const EventObject& /*Source*/ ) throw (RuntimeException, std::exception) +void SAL_CALL OPooledConnection::disposing( const EventObject& /*Source*/ ) { m_xComponent.clear(); } //XPooledConnection -Reference< XConnection > OPooledConnection::getConnection() throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > OPooledConnection::getConnection() { if(!m_xComponent.is() && m_xRealConnection.is()) { diff --git a/connectivity/source/cpool/ZPooledConnection.hxx b/connectivity/source/cpool/ZPooledConnection.hxx index ff108088efa0..839cffe7c2ee 100644 --- a/connectivity/source/cpool/ZPooledConnection.hxx +++ b/connectivity/source/cpool/ZPooledConnection.hxx @@ -49,10 +49,10 @@ namespace connectivity const css::uno::Reference< css::reflection::XProxyFactory >& _rxProxyFactory); //XPooledConnection - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; }; } diff --git a/connectivity/source/drivers/ado/ACallableStatement.cxx b/connectivity/source/drivers/ado/ACallableStatement.cxx index 969494858938..1eee379f800e 100644 --- a/connectivity/source/drivers/ado/ACallableStatement.cxx +++ b/connectivity/source/drivers/ado/ACallableStatement.cxx @@ -45,107 +45,107 @@ OCallableStatement::OCallableStatement( OConnection* _pConnection, const OUStrin } -Any SAL_CALL OCallableStatement::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL OCallableStatement::queryInterface( const Type & rType ) { Any aRet = OPreparedStatement::queryInterface(rType); return aRet.hasValue() ? aRet : ::cppu::queryInterface(rType,static_cast< XRow*>(this)); } -sal_Bool SAL_CALL OCallableStatement::wasNull( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OCallableStatement::wasNull( ) { return m_aValue.isNull(); } -sal_Bool SAL_CALL OCallableStatement::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OCallableStatement::getBoolean( sal_Int32 columnIndex ) { GET_PARAM() return m_aValue.getBool(); } -sal_Int8 SAL_CALL OCallableStatement::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Int8 SAL_CALL OCallableStatement::getByte( sal_Int32 columnIndex ) { GET_PARAM() return m_aValue.getInt8(); } -Sequence< sal_Int8 > SAL_CALL OCallableStatement::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +Sequence< sal_Int8 > SAL_CALL OCallableStatement::getBytes( sal_Int32 columnIndex ) { GET_PARAM() return m_aValue.getByteSequence(); } -css::util::Date SAL_CALL OCallableStatement::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +css::util::Date SAL_CALL OCallableStatement::getDate( sal_Int32 columnIndex ) { GET_PARAM() return m_aValue.getDate(); } -double SAL_CALL OCallableStatement::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +double SAL_CALL OCallableStatement::getDouble( sal_Int32 columnIndex ) { GET_PARAM() return m_aValue.getDouble(); } -float SAL_CALL OCallableStatement::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +float SAL_CALL OCallableStatement::getFloat( sal_Int32 columnIndex ) { GET_PARAM() return m_aValue.getFloat(); } -sal_Int32 SAL_CALL OCallableStatement::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OCallableStatement::getInt( sal_Int32 columnIndex ) { GET_PARAM() return m_aValue.getInt32(); } -sal_Int64 SAL_CALL OCallableStatement::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Int64 SAL_CALL OCallableStatement::getLong( sal_Int32 columnIndex ) { GET_PARAM() return (sal_Int64)m_aValue.getCurrency().int64; } -Any SAL_CALL OCallableStatement::getObject( sal_Int32 /*columnIndex*/, const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) +Any SAL_CALL OCallableStatement::getObject( sal_Int32 /*columnIndex*/, const Reference< css::container::XNameAccess >& /*typeMap*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getObject", *this ); return Any(); } -sal_Int16 SAL_CALL OCallableStatement::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Int16 SAL_CALL OCallableStatement::getShort( sal_Int32 columnIndex ) { GET_PARAM() return m_aValue.getInt16(); } -OUString SAL_CALL OCallableStatement::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +OUString SAL_CALL OCallableStatement::getString( sal_Int32 columnIndex ) { GET_PARAM() return m_aValue.getString(); } - css::util::Time SAL_CALL OCallableStatement::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) + css::util::Time SAL_CALL OCallableStatement::getTime( sal_Int32 columnIndex ) { GET_PARAM() return m_aValue.getTime(); } - css::util::DateTime SAL_CALL OCallableStatement::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) + css::util::DateTime SAL_CALL OCallableStatement::getTimestamp( sal_Int32 columnIndex ) { GET_PARAM() return m_aValue.getDateTime(); } -void SAL_CALL OCallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OCallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) { ADOParameter* pParam = nullptr; m_pParameters->get_Item(OLEVariant(sal_Int32(parameterIndex-1)),&pParam); @@ -156,7 +156,7 @@ void SAL_CALL OCallableStatement::registerOutParameter( sal_Int32 parameterIndex } } -void SAL_CALL OCallableStatement::registerNumericOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, sal_Int32 scale ) throw(SQLException, RuntimeException) +void SAL_CALL OCallableStatement::registerNumericOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, sal_Int32 scale ) { ADOParameter* pParam = nullptr; m_pParameters->get_Item(OLEVariant(sal_Int32(parameterIndex-1)),&pParam); @@ -169,40 +169,40 @@ void SAL_CALL OCallableStatement::registerNumericOutParameter( sal_Int32 paramet } -Reference< css::io::XInputStream > SAL_CALL OCallableStatement::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< css::io::XInputStream > SAL_CALL OCallableStatement::getBinaryStream( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getBinaryStream", *this ); return nullptr; } -Reference< css::io::XInputStream > SAL_CALL OCallableStatement::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< css::io::XInputStream > SAL_CALL OCallableStatement::getCharacterStream( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getCharacterStream", *this ); return nullptr; } -Reference< XArray > SAL_CALL OCallableStatement::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XArray > SAL_CALL OCallableStatement::getArray( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getArray", *this ); return nullptr; } -Reference< XClob > SAL_CALL OCallableStatement::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XClob > SAL_CALL OCallableStatement::getClob( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getClob", *this ); return nullptr; } -Reference< XBlob > SAL_CALL OCallableStatement::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XBlob > SAL_CALL OCallableStatement::getBlob( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getBlob", *this ); return nullptr; } -Reference< XRef > SAL_CALL OCallableStatement::getRef( sal_Int32 /*columnIndex*/) throw(SQLException, RuntimeException) +Reference< XRef > SAL_CALL OCallableStatement::getRef( sal_Int32 /*columnIndex*/) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getRef", *this ); return nullptr; diff --git a/connectivity/source/drivers/ado/AColumn.cxx b/connectivity/source/drivers/ado/AColumn.cxx index 310ec678a112..1683f0d9dcfb 100644 --- a/connectivity/source/drivers/ado/AColumn.cxx +++ b/connectivity/source/drivers/ado/AColumn.cxx @@ -92,7 +92,7 @@ Sequence< sal_Int8 > OAdoColumn::getUnoTunnelImplementationId() // css::lang::XUnoTunnel -sal_Int64 OAdoColumn::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) +sal_Int64 OAdoColumn::getSomething( const Sequence< sal_Int8 > & rId ) { return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) ? reinterpret_cast< sal_Int64 >( this ) @@ -107,7 +107,7 @@ void OAdoColumn::construct() registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_RELATEDCOLUMN), PROPERTY_ID_RELATEDCOLUMN, nAttrib,&m_ReferencedColumn, ::cppu::UnoType::get()); } -void OAdoColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception) +void OAdoColumn::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) { if(m_aColumn.IsValid()) { diff --git a/connectivity/source/drivers/ado/AColumns.cxx b/connectivity/source/drivers/ado/AColumns.cxx index 352ca9989257..b1395122343e 100644 --- a/connectivity/source/drivers/ado/AColumns.cxx +++ b/connectivity/source/drivers/ado/AColumns.cxx @@ -46,7 +46,7 @@ sdbcx::ObjectType OColumns::createObject(const OUString& _rName) } -void OColumns::impl_refresh() throw(RuntimeException) +void OColumns::impl_refresh() { m_aCollection.Refresh(); } diff --git a/connectivity/source/drivers/ado/AConnection.cxx b/connectivity/source/drivers/ado/AConnection.cxx index 15432c3b4611..77daa121cac0 100644 --- a/connectivity/source/drivers/ado/AConnection.cxx +++ b/connectivity/source/drivers/ado/AConnection.cxx @@ -44,7 +44,7 @@ using namespace com::sun::star::sdbcx; IMPLEMENT_SERVICE_INFO(OConnection,"com.sun.star.sdbcx.AConnection","com.sun.star.sdbc.Connection"); -OConnection::OConnection(ODriver* _pDriver) throw(SQLException, RuntimeException) +OConnection::OConnection(ODriver* _pDriver) : OSubComponent(static_cast(_pDriver), this), m_xCatalog(nullptr), m_pDriver(_pDriver), @@ -158,7 +158,7 @@ void SAL_CALL OConnection::release() throw() release_ChildImpl(); } -Reference< XStatement > SAL_CALL OConnection::createStatement( ) throw(SQLException, RuntimeException) +Reference< XStatement > SAL_CALL OConnection::createStatement( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -169,7 +169,7 @@ Reference< XStatement > SAL_CALL OConnection::createStatement( ) throw(SQLExcep return pStmt; } -Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -181,7 +181,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OU return xPStmt; } -Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& sql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -193,7 +193,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUStrin return xPStmt; } -OUString SAL_CALL OConnection::nativeSQL( const OUString& _sql ) throw(SQLException, RuntimeException) +OUString SAL_CALL OConnection::nativeSQL( const OUString& _sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -214,7 +214,7 @@ OUString SAL_CALL OConnection::nativeSQL( const OUString& _sql ) throw(SQLExcept return sql; } -void SAL_CALL OConnection::setAutoCommit( sal_Bool autoCommit ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::setAutoCommit( sal_Bool autoCommit ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -227,7 +227,7 @@ void SAL_CALL OConnection::setAutoCommit( sal_Bool autoCommit ) throw(SQLExcepti m_pAdoConnection->RollbackTrans(); } -sal_Bool SAL_CALL OConnection::getAutoCommit( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OConnection::getAutoCommit( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -236,7 +236,7 @@ sal_Bool SAL_CALL OConnection::getAutoCommit( ) throw(SQLException, RuntimeExce return m_bAutocommit; } -void SAL_CALL OConnection::commit( ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::commit( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -245,7 +245,7 @@ void SAL_CALL OConnection::commit( ) throw(SQLException, RuntimeException) m_pAdoConnection->CommitTrans(); } -void SAL_CALL OConnection::rollback( ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::rollback( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -254,14 +254,14 @@ void SAL_CALL OConnection::rollback( ) throw(SQLException, RuntimeException) m_pAdoConnection->RollbackTrans(); } -sal_Bool SAL_CALL OConnection::isClosed( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OConnection::isClosed( ) { ::osl::MutexGuard aGuard( m_aMutex ); return OConnection_BASE::rBHelper.bDisposed && !m_pAdoConnection->get_State(); } -Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData( ) throw(SQLException, RuntimeException) +Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -277,7 +277,7 @@ Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData( ) throw(SQLEx return xMetaData; } -void SAL_CALL OConnection::setReadOnly( sal_Bool readOnly ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::setReadOnly( sal_Bool readOnly ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -287,7 +287,7 @@ void SAL_CALL OConnection::setReadOnly( sal_Bool readOnly ) throw(SQLException, ADOS::ThrowException(*m_pAdoConnection,*this); } -sal_Bool SAL_CALL OConnection::isReadOnly( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OConnection::isReadOnly( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -296,7 +296,7 @@ sal_Bool SAL_CALL OConnection::isReadOnly( ) throw(SQLException, RuntimeExcepti return m_pAdoConnection->get_Mode() == adModeRead; } -void SAL_CALL OConnection::setCatalog( const OUString& catalog ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::setCatalog( const OUString& catalog ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -305,7 +305,7 @@ void SAL_CALL OConnection::setCatalog( const OUString& catalog ) throw(SQLExcept ADOS::ThrowException(*m_pAdoConnection,*this); } -OUString SAL_CALL OConnection::getCatalog( ) throw(SQLException, RuntimeException) +OUString SAL_CALL OConnection::getCatalog( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -313,7 +313,7 @@ OUString SAL_CALL OConnection::getCatalog( ) throw(SQLException, RuntimeExcepti return m_pAdoConnection->GetDefaultDatabase(); } -void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 level ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 level ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -345,7 +345,7 @@ void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 level ) throw(SQLE ADOS::ThrowException(*m_pAdoConnection,*this); } -sal_Int32 SAL_CALL OConnection::getTransactionIsolation( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OConnection::getTransactionIsolation( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -376,7 +376,7 @@ sal_Int32 SAL_CALL OConnection::getTransactionIsolation( ) throw(SQLException, return nRet; } -Reference< css::container::XNameAccess > SAL_CALL OConnection::getTypeMap( ) throw(SQLException, RuntimeException) +Reference< css::container::XNameAccess > SAL_CALL OConnection::getTypeMap( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -385,13 +385,13 @@ Reference< css::container::XNameAccess > SAL_CALL OConnection::getTypeMap( ) th return nullptr; } -void SAL_CALL OConnection::setTypeMap( const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::setTypeMap( const Reference< css::container::XNameAccess >& /*typeMap*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setTypeMap", *this ); } // XCloseable -void SAL_CALL OConnection::close( ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::close( ) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -402,16 +402,16 @@ void SAL_CALL OConnection::close( ) throw(SQLException, RuntimeException) } // XWarningsSupplier -Any SAL_CALL OConnection::getWarnings( ) throw(SQLException, RuntimeException) +Any SAL_CALL OConnection::getWarnings( ) { return Any(); } -void SAL_CALL OConnection::clearWarnings( ) throw(SQLException, RuntimeException) +void SAL_CALL OConnection::clearWarnings( ) { } -void OConnection::buildTypeInfo() throw( SQLException) +void OConnection::buildTypeInfo() { ::osl::MutexGuard aGuard( m_aMutex ); @@ -495,7 +495,7 @@ void OConnection::disposing() dispose_ChildImpl(); } -sal_Int64 SAL_CALL OConnection::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) throw (css::uno::RuntimeException) +sal_Int64 SAL_CALL OConnection::getSomething( const css::uno::Sequence< sal_Int8 >& rId ) { return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) ? diff --git a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx index ab1f6cd5cc61..f0a6165f8e8b 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaData.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaData.cxx @@ -46,7 +46,7 @@ ODatabaseMetaData::ODatabaseMetaData(OConnection* _pCon) { } -sal_Int32 ODatabaseMetaData::getInt32Property(const OUString& _aProperty) throw(css::sdbc::SQLException, css::uno::RuntimeException) +sal_Int32 ODatabaseMetaData::getInt32Property(const OUString& _aProperty) { connectivity::ado::WpADOProperties aProps(m_pADOConnection->get_Properties()); // ADOS::ThrowException(*m_pADOConnection,*this); @@ -59,7 +59,7 @@ sal_Int32 ODatabaseMetaData::getInt32Property(const OUString& _aProperty) throw } -bool ODatabaseMetaData::getBoolProperty(const OUString& _aProperty) throw(css::sdbc::SQLException, css::uno::RuntimeException) +bool ODatabaseMetaData::getBoolProperty(const OUString& _aProperty) { connectivity::ado::WpADOProperties aProps(m_pADOConnection->get_Properties()); ADOS::ThrowException(*m_pADOConnection,*this); @@ -68,7 +68,7 @@ bool ODatabaseMetaData::getBoolProperty(const OUString& _aProperty) throw(css:: return !aVar.isNull() && !aVar.isEmpty() && aVar.getBool(); } -OUString ODatabaseMetaData::getStringProperty(const OUString& _aProperty) throw(css::sdbc::SQLException, css::uno::RuntimeException) +OUString ODatabaseMetaData::getStringProperty(const OUString& _aProperty) { connectivity::ado::WpADOProperties aProps(m_pADOConnection->get_Properties()); ADOS::ThrowException(*m_pADOConnection,*this); @@ -92,7 +92,7 @@ Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw( ) return xRef; } -Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs( ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs( ) { OLEVariant vtEmpty; vtEmpty.setNoArg(); @@ -115,7 +115,7 @@ OUString ODatabaseMetaData::impl_getCatalogSeparator_throw( ) return getLiteral(DBLITERAL_CATALOG_SEPARATOR); } -Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas( ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas( ) { OLEVariant vtEmpty; vtEmpty.setNoArg(); @@ -134,7 +134,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas( ) throw(SQLExce Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges( const Any& catalog, const OUString& schema, const OUString& table, - const OUString& columnNamePattern ) throw(SQLException, RuntimeException) + const OUString& columnNamePattern ) { ADORecordset *pRecordset = m_pADOConnection->getColumnPrivileges(catalog,schema,table,columnNamePattern); ADOS::ThrowException(*m_pADOConnection,*this); @@ -149,7 +149,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges( Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, - const OUString& columnNamePattern ) throw(SQLException, RuntimeException) + const OUString& columnNamePattern ) { ADORecordset *pRecordset = m_pADOConnection->getColumns(catalog,schemaPattern,tableNamePattern,columnNamePattern); ADOS::ThrowException(*m_pADOConnection,*this); @@ -165,7 +165,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( const Any& catalog, const OUString& schemaPattern, - const OUString& tableNamePattern, const Sequence< OUString >& types ) throw(SQLException, RuntimeException) + const OUString& tableNamePattern, const Sequence< OUString >& types ) { ADORecordset *pRecordset = m_pADOConnection->getTables(catalog,schemaPattern,tableNamePattern,types); ADOS::ThrowException(*m_pADOConnection,*this); @@ -181,7 +181,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns( const Any& catalog, const OUString& schemaPattern, - const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(SQLException, RuntimeException) + const OUString& procedureNamePattern, const OUString& columnNamePattern ) { ADORecordset *pRecordset = m_pADOConnection->getProcedureColumns(catalog,schemaPattern,procedureNamePattern,columnNamePattern); ADOS::ThrowException(*m_pADOConnection,*this); @@ -197,7 +197,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns( Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures( const Any& catalog, const OUString& schemaPattern, - const OUString& procedureNamePattern ) throw(SQLException, RuntimeException) + const OUString& procedureNamePattern ) { // Create elements used in the array ADORecordset *pRecordset = m_pADOConnection->getProcedures(catalog,schemaPattern,procedureNamePattern); @@ -212,57 +212,57 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures( return xRef; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength( ) { return getMaxSize(DBLITERAL_BINARY_LITERAL); } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize( ) { return getInt32Property("Maximum Row Size"); } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength( ) { return getMaxSize(DBLITERAL_CATALOG_NAME); } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength( ) { return getMaxSize(DBLITERAL_CHAR_LITERAL); } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength( ) { return getMaxSize(DBLITERAL_COLUMN_NAME); } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex( ) { return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength( ) { return getMaxSize(DBLITERAL_CURSOR_NAME); } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections( ) { return getInt32Property("Active Sessions"); } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable( ) { return getInt32Property("Max Columns in Table"); } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength( ) { return getMaxSize(DBLITERAL_TEXT_COMMAND); } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength( ) { return getMaxSize(DBLITERAL_TABLE_NAME); } @@ -273,7 +273,7 @@ sal_Int32 ODatabaseMetaData::impl_getMaxTablesInSelect_throw( ) } Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys( - const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schema, const OUString& table ) { ADORecordset *pRecordset = m_pADOConnection->getExportedKeys(catalog,schema,table); ADOS::ThrowException(*m_pADOConnection,*this); @@ -287,7 +287,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys( } Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys( - const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schema, const OUString& table ) { ADORecordset *pRecordset = m_pADOConnection->getImportedKeys(catalog,schema,table); ADOS::ThrowException(*m_pADOConnection,*this); @@ -302,7 +302,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys( } Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys( - const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schema, const OUString& table ) { ADORecordset *pRecordset = m_pADOConnection->getPrimaryKeys(catalog,schema,table); ADOS::ThrowException(*m_pADOConnection,*this); @@ -318,7 +318,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys( Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo( const Any& catalog, const OUString& schema, const OUString& table, - sal_Bool unique, sal_Bool approximate ) throw(SQLException, RuntimeException) + sal_Bool unique, sal_Bool approximate ) { ADORecordset *pRecordset = m_pADOConnection->getIndexInfo(catalog,schema,table,unique,approximate); ADOS::ThrowException(*m_pADOConnection,*this); @@ -333,7 +333,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo( } Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( - const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(SQLException, RuntimeException) + const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) { Reference< XResultSet > xRef; if(!ADOS::isJetEngine(m_pConnection->getEngineType())) @@ -388,7 +388,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference( const Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const Any& foreignCatalog, - const OUString& foreignSchema, const OUString& foreignTable ) throw(SQLException, RuntimeException) + const OUString& foreignSchema, const OUString& foreignTable ) { ADORecordset *pRecordset = m_pADOConnection->getCrossReference(primaryCatalog,primarySchema,primaryTable,foreignCatalog,foreignSchema,foreignTable); ADOS::ThrowException(*m_pADOConnection,*this); @@ -402,17 +402,17 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference( return xRef; } -sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) { return getBoolProperty("Maximum Row Size Includes BLOB"); } -sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) { return (getInt32Property("Identifier Case Sensitivity") & DBPROPVAL_IC_LOWER) == DBPROPVAL_IC_LOWER ; } -sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers( ) { return (getInt32Property("Identifier Case Sensitivity") & DBPROPVAL_IC_LOWER) == DBPROPVAL_IC_LOWER ; } @@ -422,17 +422,17 @@ bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) return (getInt32Property("Identifier Case Sensitivity") & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED ; } -sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers( ) { return (getInt32Property("Identifier Case Sensitivity") & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED ; } -sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) { return (getInt32Property("Identifier Case Sensitivity") & DBPROPVAL_IC_UPPER) == DBPROPVAL_IC_UPPER ; } -sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers( ) { return (getInt32Property("Identifier Case Sensitivity") & DBPROPVAL_IC_UPPER) == DBPROPVAL_IC_UPPER ; } @@ -447,17 +447,17 @@ bool ODatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw( ) return true; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength( ) { return getInt32Property("Maximum Index Size"); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) { return getInt32Property("NULL Concatenation Behavior") == DBPROPVAL_CB_NON_NULL; } -OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) { return getStringProperty("Catalog Term"); } @@ -468,12 +468,12 @@ OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( ) } -OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) { return OUString(); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( ) { return isCapable(DBLITERAL_CORRELATION_NAME); } @@ -483,57 +483,57 @@ bool ODatabaseMetaData::impl_isCatalogAtStart_throw( ) return getInt32Property("Catalog Location") == DBPROPVAL_CL_START; } -sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions( ) { return getInt32Property("Transaction DDL") == DBPROPVAL_TC_DDL_IGNORE; } -sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit( ) { return getInt32Property("Transaction DDL") == DBPROPVAL_TC_DDL_COMMIT; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly( ) { return getInt32Property("Transaction DDL") == DBPROPVAL_TC_DML; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) { return getInt32Property("Transaction DDL") == DBPROPVAL_TC_ALL; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback( ) { return getInt32Property("Prepare Abort Behavior") == DBPROPVAL_CB_PRESERVE; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit( ) { return getInt32Property("Prepare Commit Behavior") == DBPROPVAL_CB_PRESERVE; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit( ) { return (getInt32Property("Isolation Retention") & DBPROPVAL_TR_COMMIT) == DBPROPVAL_TR_COMMIT; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback( ) { return (getInt32Property("Isolation Retention") & DBPROPVAL_TR_ABORT) == DBPROPVAL_TR_ABORT; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level ) { bool bValue(false); @@ -557,25 +557,25 @@ bool ODatabaseMetaData::impl_supportsSchemasInDataManipulation_throw( ) return (getInt32Property("Schema Usage") & DBPROPVAL_SU_DML_STATEMENTS) == DBPROPVAL_SU_DML_STATEMENTS; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL( ) { sal_Int32 nProp = getInt32Property("SQL Support"); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI92_FULL) == DBPROPVAL_SQL_ANSI92_FULL); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL( ) { sal_Int32 nProp = getInt32Property("SQL Support"); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI92_ENTRY) == DBPROPVAL_SQL_ANSI92_ENTRY); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility( ) { sal_Int32 nProp = getInt32Property("SQL Support"); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI89_IEF) == DBPROPVAL_SQL_ANSI89_IEF); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions( ) { return (getInt32Property("Schema Usage") & DBPROPVAL_SU_INDEX_DEFINITION) == DBPROPVAL_SU_INDEX_DEFINITION; } @@ -590,7 +590,7 @@ bool ODatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw( ) return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions( ) { return false; } @@ -600,14 +600,14 @@ bool ODatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw( ) return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins( ) { if ( ADOS::isJetEngine(m_pConnection->getEngineType()) ) return true; return getBoolProperty("Outer Join Capabilities"); } -Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) { return new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTableTypes); } @@ -617,132 +617,132 @@ sal_Int32 ODatabaseMetaData::impl_getMaxStatements_throw( ) return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength( ) { return getMaxSize(DBLITERAL_PROCEDURE_NAME); } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength( ) { return getMaxSize(DBLITERAL_SCHEMA_NAME); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions( ) { return getInt32Property("Transaction DDL") == DBPROPVAL_TC_NONE; } -sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly( ) { return getBoolProperty("Read-Only Data Source"); } -sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull( ) { return getInt32Property("NULL Concatenation Behavior") == DBPROPVAL_CB_NULL; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing( ) { return isCapable(DBLITERAL_COLUMN_ALIAS); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames( ) { return isCapable(DBLITERAL_CORRELATION_NAME); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, sal_Int32 /*toType*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, sal_Int32 /*toType*/ ) { return getBoolProperty("Rowset Conversions on Command"); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy( ) { return getBoolProperty("ORDER BY Columns in Select List"); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy( ) { return getInt32Property("GROUP BY Support") != DBPROPVAL_GB_NOT_SUPPORTED; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect( ) { return getInt32Property("GROUP BY Support") != DBPROPVAL_GB_CONTAINS_SELECT; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated( ) { return getInt32Property("GROUP BY Support") == DBPROPVAL_GB_NO_RELATION; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause( ) { return isCapable(DBLITERAL_ESCAPE_PERCENT); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated( ) { return getBoolProperty("ORDER BY Columns in Select List"); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers( ) { return (getInt32Property("Identifier Case Sensitivity") & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED; } @@ -752,123 +752,123 @@ bool ODatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw( ) return (getInt32Property("Identifier Case Sensitivity") & DBPROPVAL_IC_MIXED) == DBPROPVAL_IC_MIXED; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd( ) { return (getInt32Property("NULL Collation Order") & DBPROPVAL_NC_END) == DBPROPVAL_NC_END; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart( ) { return (getInt32Property("NULL Collation Order") & DBPROPVAL_NC_START) == DBPROPVAL_NC_START; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh( ) { return (getInt32Property("NULL Collation Order") & DBPROPVAL_NC_HIGH) == DBPROPVAL_NC_HIGH; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow( ) { return (getInt32Property("NULL Collation Order") & DBPROPVAL_NC_LOW) == DBPROPVAL_NC_LOW; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) { return (getInt32Property("Schema Usage") & DBPROPVAL_SU_PRIVILEGE_DEFINITION) == DBPROPVAL_SU_PRIVILEGE_DEFINITION; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries( ) { return (getInt32Property("Subquery Support") & DBPROPVAL_SQ_CORRELATEDSUBQUERIES) == DBPROPVAL_SQ_CORRELATEDSUBQUERIES; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons( ) { return (getInt32Property("Subquery Support") & DBPROPVAL_SQ_COMPARISON) == DBPROPVAL_SQ_COMPARISON; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists( ) { return (getInt32Property("Subquery Support") & DBPROPVAL_SQ_EXISTS) == DBPROPVAL_SQ_EXISTS; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns( ) { return (getInt32Property("Subquery Support") & DBPROPVAL_SQ_IN) == DBPROPVAL_SQ_IN; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds( ) { return (getInt32Property("Subquery Support") & DBPROPVAL_SQ_QUANTIFIED) == DBPROPVAL_SQ_QUANTIFIED; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) { sal_Int32 nProp = getInt32Property("SQL Support"); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ANSI92_INTERMEDIATE) == DBPROPVAL_SQL_ANSI92_INTERMEDIATE); } -OUString SAL_CALL ODatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getURL( ) { return "sdbc:ado:"+ m_pADOConnection->GetConnectionString(); } -OUString SAL_CALL ODatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getUserName( ) { return getStringProperty("User Name"); } -OUString SAL_CALL ODatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDriverName( ) { return getStringProperty("Provider Friendly Name"); } -OUString SAL_CALL ODatabaseMetaData::getDriverVersion( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDriverVersion( ) { return getStringProperty("Provider Version"); } -OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) { return getStringProperty("DBMS Version"); } -OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) { return getStringProperty("DBMS Name"); } -OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) { return getStringProperty("Procedure Term"); } -OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) { return getStringProperty("Schema Term"); } -sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion( ) { return 1; } -sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation( ) { sal_Int32 nRet = TransactionIsolation::NONE; switch(m_pADOConnection->get_IsolationLevel()) @@ -891,12 +891,12 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation( ) throw(S return nRet; } -sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) { return 0; } -OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) { ADORecordset *pRecordset = nullptr; OLEVariant vtEmpty; @@ -926,146 +926,146 @@ OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) throw(SQLException, Runt return OUString(); } -OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) { return getLiteral(DBLITERAL_ESCAPE_PERCENT); } -OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) { OUString aValue; return aValue.copy(0,aValue.lastIndexOf(',')); } -OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) { OUString aValue; return aValue; } -OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) { OUString aValue; return aValue.copy(0,aValue.lastIndexOf(',')); } -OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) { OUString aValue; return aValue; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) { sal_Int32 nProp = getInt32Property("SQL Support"); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ODBC_EXTENDED) == DBPROPVAL_SQL_ODBC_EXTENDED); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar( ) { sal_Int32 nProp = getInt32Property("SQL Support"); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ODBC_CORE) == DBPROPVAL_SQL_ODBC_CORE); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar( ) { sal_Int32 nProp = getInt32Property("SQL Support"); return (nProp == 512) || ((nProp & DBPROPVAL_SQL_ODBC_MINIMUM) == DBPROPVAL_SQL_ODBC_MINIMUM); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins( ) { if ( ADOS::isJetEngine(m_pConnection->getEngineType()) ) return true; return (getInt32Property("Outer Join Capabilities") & 0x00000004L) == 0x00000004L; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins( ) { return supportsFullOuterJoins( ); } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy( ) { return getInt32Property("Max Columns in GROUP BY"); } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy( ) { return getInt32Property("Max Columns in ORDER BY"); } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect( ) { return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength( ) { return getMaxSize(DBLITERAL_USER_NAME); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 /*setType*/ ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 /*setType*/, sal_Int32 /*concurrency*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 /*setType*/, sal_Int32 /*concurrency*/ ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType ) { return ResultSetType::FORWARD_ONLY != setType; } -sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType ) { return ResultSetType::FORWARD_ONLY != setType; } -sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType ) { return ResultSetType::FORWARD_ONLY != setType; } -sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 setType ) { return ResultSetType::FORWARD_ONLY != setType; } -sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 setType ) { return ResultSetType::FORWARD_ONLY != setType; } -sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 setType ) { return ResultSetType::FORWARD_ONLY != setType; } -sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 setType ) { return ResultSetType::FORWARD_ONLY != setType; } -sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 setType ) { return ResultSetType::FORWARD_ONLY != setType; } -sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 setType ) { return ResultSetType::FORWARD_ONLY != setType; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates( ) { return true; } -Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XDatabaseMetaData::getUDTs", *this ); return Reference< XResultSet >(); diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx index 1a479721fe4e..381113c431fe 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataImpl.cxx @@ -255,42 +255,42 @@ void ODatabaseMetaDataResultSetMetaData::setProceduresMap() DataType::VARCHAR); } -sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSearchable( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSearchable( sal_Int32 column ) { if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isSearchable(); return true; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isAutoIncrement( sal_Int32 column ) { if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isAutoIncrement(); return false; } -OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnServiceName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnServiceName( sal_Int32 column ) { if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getColumnServiceName(); return OUString(); } -OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getTableName( sal_Int32 column ) { if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getTableName(); return OUString(); } -OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getCatalogName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getCatalogName( sal_Int32 column ) { if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getCatalogName(); return OUString(); } -OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnTypeName( sal_Int32 column ) { if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getColumnTypeName(); @@ -298,7 +298,7 @@ OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnTypeName( sal_Int } -sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCaseSensitive( sal_Int32 column ) { if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isCaseSensitive(); @@ -306,7 +306,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCaseSensitive( sal_Int32 } -OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getSchemaName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getSchemaName( sal_Int32 column ) { if(!m_mColumns.empty() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getSchemaName(); diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx index 69269348dbbf..09ee0797e09c 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSet.cxx @@ -93,13 +93,13 @@ void ODatabaseMetaDataResultSet::disposing() m_xMetaData.clear(); } -Any SAL_CALL ODatabaseMetaDataResultSet::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL ODatabaseMetaDataResultSet::queryInterface( const Type & rType ) { Any aRet = OPropertySetHelper::queryInterface(rType); return aRet.hasValue() ? aRet : ODatabaseMetaDataResultSet_BASE::queryInterface(rType); } -css::uno::Sequence< css::uno::Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes( ) throw(css::uno::RuntimeException) +css::uno::Sequence< css::uno::Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes( ) { ::cppu::OTypeCollection aTypes( cppu::UnoType::get(), cppu::UnoType::get(), @@ -108,14 +108,14 @@ css::uno::Sequence< css::uno::Type > SAL_CALL ODatabaseMetaDataResultSet::getTyp return ::comphelper::concatSequences(aTypes.getTypes(),ODatabaseMetaDataResultSet_BASE::getTypes()); } -void ODatabaseMetaDataResultSet::checkRecordSet() throw(SQLException) +void ODatabaseMetaDataResultSet::checkRecordSet() { if(!m_pRecordSet) throwFunctionSequenceException(*this); } -sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& columnName ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed ); @@ -137,7 +137,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& colum } #define BLOCK_SIZE 256 -Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getBinaryStream( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -180,14 +180,14 @@ Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getBinar return new SequenceInputStream(m_aValue.getByteSequence()); } -Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getCharacterStream", *this ); return nullptr; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::getBoolean( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -201,7 +201,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::getBoolean( sal_Int32 columnIndex } -sal_Int8 SAL_CALL ODatabaseMetaDataResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Int8 SAL_CALL ODatabaseMetaDataResultSet::getByte( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -220,31 +220,31 @@ sal_Int8 SAL_CALL ODatabaseMetaDataResultSet::getByte( sal_Int32 columnIndex ) t } -Sequence< sal_Int8 > SAL_CALL ODatabaseMetaDataResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +Sequence< sal_Int8 > SAL_CALL ODatabaseMetaDataResultSet::getBytes( sal_Int32 columnIndex ) { return getValue(columnIndex).getByteSequence(); } -css::util::Date SAL_CALL ODatabaseMetaDataResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +css::util::Date SAL_CALL ODatabaseMetaDataResultSet::getDate( sal_Int32 columnIndex ) { return getValue(columnIndex).getDate(); } -double SAL_CALL ODatabaseMetaDataResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +double SAL_CALL ODatabaseMetaDataResultSet::getDouble( sal_Int32 columnIndex ) { return getValue(columnIndex).getDouble(); } -float SAL_CALL ODatabaseMetaDataResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +float SAL_CALL ODatabaseMetaDataResultSet::getFloat( sal_Int32 columnIndex ) { return getValue(columnIndex).getFloat(); } -sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getInt( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -264,21 +264,21 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getInt( sal_Int32 columnIndex ) t } -sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getRow( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getRow( ) { ::dbtools::throwFeatureNotImplementedSQLException( "XResultSet::getRow", *this ); return 0; } -sal_Int64 SAL_CALL ODatabaseMetaDataResultSet::getLong( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +sal_Int64 SAL_CALL ODatabaseMetaDataResultSet::getLong( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getLong", *this ); return sal_Int64(0); } -Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData( ) throw(SQLException, RuntimeException) +Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -292,34 +292,34 @@ Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData return m_xMetaData; } -Reference< XArray > SAL_CALL ODatabaseMetaDataResultSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XArray > SAL_CALL ODatabaseMetaDataResultSet::getArray( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getRow", *this ); return nullptr; } -Reference< XClob > SAL_CALL ODatabaseMetaDataResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XClob > SAL_CALL ODatabaseMetaDataResultSet::getClob( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getRow", *this ); return nullptr; } -Reference< XBlob > SAL_CALL ODatabaseMetaDataResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XBlob > SAL_CALL ODatabaseMetaDataResultSet::getBlob( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getRow", *this ); return nullptr; } -Reference< XRef > SAL_CALL ODatabaseMetaDataResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XRef > SAL_CALL ODatabaseMetaDataResultSet::getRef( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getRow", *this ); return nullptr; } -Any SAL_CALL ODatabaseMetaDataResultSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) +Any SAL_CALL ODatabaseMetaDataResultSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -332,7 +332,7 @@ Any SAL_CALL ODatabaseMetaDataResultSet::getObject( sal_Int32 columnIndex, const } -sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -351,7 +351,7 @@ sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex ) } -OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -368,19 +368,19 @@ OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) } -css::util::Time SAL_CALL ODatabaseMetaDataResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +css::util::Time SAL_CALL ODatabaseMetaDataResultSet::getTime( sal_Int32 columnIndex ) { return getValue(columnIndex).getTime(); } -css::util::DateTime SAL_CALL ODatabaseMetaDataResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +css::util::DateTime SAL_CALL ODatabaseMetaDataResultSet::getTimestamp( sal_Int32 columnIndex ) { return getValue(columnIndex).getDateTime(); } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isAfterLast( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isAfterLast( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -393,7 +393,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isAfterLast( ) throw(SQLException return bIsAtEOF == VARIANT_TRUE; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isFirst( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isFirst( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -404,7 +404,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isFirst( ) throw(SQLException, Ru return m_nRowPos == 1; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -415,7 +415,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast( ) throw(SQLException, Run return true; } -void SAL_CALL ODatabaseMetaDataResultSet::beforeFirst( ) throw(SQLException, RuntimeException) +void SAL_CALL ODatabaseMetaDataResultSet::beforeFirst( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -427,7 +427,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::beforeFirst( ) throw(SQLException, Ru previous(); } -void SAL_CALL ODatabaseMetaDataResultSet::afterLast( ) throw(SQLException, RuntimeException) +void SAL_CALL ODatabaseMetaDataResultSet::afterLast( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -441,7 +441,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::afterLast( ) throw(SQLException, Runt } -void SAL_CALL ODatabaseMetaDataResultSet::close( ) throw(SQLException, RuntimeException) +void SAL_CALL ODatabaseMetaDataResultSet::close( ) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -452,7 +452,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::close( ) throw(SQLException, RuntimeE } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::first( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::first( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -468,7 +468,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::first( ) throw(SQLException, Runt } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::last( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::last( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed ); @@ -477,7 +477,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::last( ) throw(SQLException, Runti return m_pRecordSet && SUCCEEDED(m_pRecordSet->MoveLast()); } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::absolute( sal_Int32 row ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -495,7 +495,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::absolute( sal_Int32 row ) throw(SQ return false; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::relative( sal_Int32 row ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -512,7 +512,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::relative( sal_Int32 row ) throw(SQ return bRet; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -527,13 +527,13 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous( ) throw(SQLException, R return bRet; } -Reference< XInterface > SAL_CALL ODatabaseMetaDataResultSet::getStatement( ) throw(SQLException, RuntimeException) +Reference< XInterface > SAL_CALL ODatabaseMetaDataResultSet::getStatement( ) { return m_aStatement.get(); } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowDeleted( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowDeleted( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -546,7 +546,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowDeleted( ) throw(SQLException, return (RecordStatusEnum(eRec) & adRecDeleted) == adRecDeleted; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowInserted( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowInserted( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -558,7 +558,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowInserted( ) throw(SQLException return (RecordStatusEnum(eRec) & adRecNew) == adRecNew; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -572,7 +572,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated( ) throw(SQLException, } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isBeforeFirst( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isBeforeFirst( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -587,7 +587,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isBeforeFirst( ) throw(SQLExcepti } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -606,7 +606,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next( ) throw(SQLException, Runti } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::wasNull( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::wasNull( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -617,7 +617,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::wasNull( ) throw(SQLException, Ru return m_aValue.isNull(); } -void SAL_CALL ODatabaseMetaDataResultSet::refreshRow( ) throw(SQLException, RuntimeException) +void SAL_CALL ODatabaseMetaDataResultSet::refreshRow( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -629,7 +629,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::refreshRow( ) throw(SQLException, Run } -void SAL_CALL ODatabaseMetaDataResultSet::cancel( ) throw(RuntimeException) +void SAL_CALL ODatabaseMetaDataResultSet::cancel( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -640,35 +640,31 @@ void SAL_CALL ODatabaseMetaDataResultSet::cancel( ) throw(RuntimeException) m_pRecordSet->Cancel(); } -void SAL_CALL ODatabaseMetaDataResultSet::clearWarnings( ) throw(SQLException, RuntimeException) +void SAL_CALL ODatabaseMetaDataResultSet::clearWarnings( ) { } -Any SAL_CALL ODatabaseMetaDataResultSet::getWarnings( ) throw(SQLException, RuntimeException) +Any SAL_CALL ODatabaseMetaDataResultSet::getWarnings( ) { return Any(); } sal_Int32 ODatabaseMetaDataResultSet::getResultSetConcurrency() - throw(css::sdbc::SQLException, css::uno::RuntimeException) { return ResultSetConcurrency::READ_ONLY; } sal_Int32 ODatabaseMetaDataResultSet::getResultSetType() - throw(css::sdbc::SQLException, css::uno::RuntimeException) { return ResultSetType::FORWARD_ONLY; } sal_Int32 ODatabaseMetaDataResultSet::getFetchDirection() - throw(css::sdbc::SQLException, css::uno::RuntimeException) { return FetchDirection::FORWARD; } sal_Int32 ODatabaseMetaDataResultSet::getFetchSize() const - throw(css::sdbc::SQLException, css::uno::RuntimeException) { sal_Int32 nValue=-1; if(m_pRecordSet) @@ -677,20 +673,17 @@ sal_Int32 ODatabaseMetaDataResultSet::getFetchSize() const } OUString ODatabaseMetaDataResultSet::getCursorName() - throw(css::sdbc::SQLException, css::uno::RuntimeException) { return OUString(); } void ODatabaseMetaDataResultSet::setFetchDirection(sal_Int32 /*_par0*/) - throw(css::sdbc::SQLException, css::uno::RuntimeException) { ::dbtools::throwFeatureNotImplementedSQLException( "ResultSet::FetchDirection", *this ); } void ODatabaseMetaDataResultSet::setFetchSize(sal_Int32 _par0) - throw(css::sdbc::SQLException, css::uno::RuntimeException) { if(m_pRecordSet) m_pRecordSet->put_CacheSize(_par0); @@ -726,7 +719,6 @@ sal_Bool ODatabaseMetaDataResultSet::convertFastPropertyValue( Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) - throw (css::lang::IllegalArgumentException) { switch(nHandle) { @@ -748,7 +740,6 @@ void ODatabaseMetaDataResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& /*rValue*/ ) - throw (Exception) { switch(nHandle) { @@ -1193,12 +1184,12 @@ void SAL_CALL ODatabaseMetaDataResultSet::release() throw() ODatabaseMetaDataResultSet_BASE::release(); } -css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL ODatabaseMetaDataResultSet::getPropertySetInfo( ) throw(css::uno::RuntimeException) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL ODatabaseMetaDataResultSet::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } -OLEVariant ODatabaseMetaDataResultSet::getValue(sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +OLEVariant ODatabaseMetaDataResultSet::getValue(sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx index 4b35c93c6436..9a035e298993 100644 --- a/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx +++ b/connectivity/source/drivers/ado/ADatabaseMetaDataResultSetMetaData.cxx @@ -36,7 +36,7 @@ ODatabaseMetaDataResultSetMetaData::~ODatabaseMetaDataResultSetMetaData() m_pRecordSet->Release(); } -sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) { sal_Int32 nSize = 0; if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) @@ -51,7 +51,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnDisplaySize( sal } -sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnType( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnType( sal_Int32 column ) { sal_Int32 nType = 0; if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) @@ -65,7 +65,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnType( sal_Int32 } -sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnCount( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnCount( ) { if(!m_pRecordSet) return 0; @@ -83,7 +83,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnCount( ) throw( } -OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnName( sal_Int32 column ) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getColumnName(); @@ -96,7 +96,7 @@ OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnName( sal_Int32 c return OUString(); } -OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnLabel( sal_Int32 column ) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getColumnLabel(); @@ -104,7 +104,7 @@ OUString SAL_CALL ODatabaseMetaDataResultSetMetaData::getColumnLabel( sal_Int32 } -sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCurrency( sal_Int32 column ) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isCurrency(); @@ -119,7 +119,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isCurrency( sal_Int32 colu } -sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSigned( sal_Int32 column ) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isSigned(); @@ -133,7 +133,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isSigned( sal_Int32 column return false; } -sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getPrecision( sal_Int32 column ) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getPrecision(); @@ -145,7 +145,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getPrecision( sal_Int32 c return 0; } -sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getScale( sal_Int32 column ) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.getScale(); @@ -160,7 +160,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::getScale( sal_Int32 colum } -sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::isNullable( sal_Int32 column ) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isNullable(); @@ -177,7 +177,7 @@ sal_Int32 SAL_CALL ODatabaseMetaDataResultSetMetaData::isNullable( sal_Int32 col } -sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isReadOnly( sal_Int32 column ) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isReadOnly(); @@ -194,7 +194,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isReadOnly( sal_Int32 colu } -sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isDefinitelyWritable(); @@ -211,7 +211,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isDefinitelyWritable( sal_ ; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL ODatabaseMetaDataResultSetMetaData::isWritable( sal_Int32 column ) { if(m_mColumns.size() && (m_mColumnsIter = m_mColumns.find(column)) != m_mColumns.end()) return (*m_mColumnsIter).second.isWritable(); diff --git a/connectivity/source/drivers/ado/ADriver.cxx b/connectivity/source/drivers/ado/ADriver.cxx index 7d14a58206ae..0494334904ec 100644 --- a/connectivity/source/drivers/ado/ADriver.cxx +++ b/connectivity/source/drivers/ado/ADriver.cxx @@ -78,12 +78,12 @@ void ODriver::disposing() } // static ServiceInfo -OUString ODriver::getImplementationName_Static( ) throw(RuntimeException) +OUString ODriver::getImplementationName_Static( ) { return OUString("com.sun.star.comp.sdbc.ado.ODriver"); } -Sequence< OUString > ODriver::getSupportedServiceNames_Static( ) throw (RuntimeException) +Sequence< OUString > ODriver::getSupportedServiceNames_Static( ) { Sequence< OUString > aSNS( 2 ); aSNS[0] = "com.sun.star.sdbc.Driver"; @@ -91,30 +91,30 @@ Sequence< OUString > ODriver::getSupportedServiceNames_Static( ) throw (Runtime return aSNS; } -css::uno::Reference< css::uno::XInterface > SAL_CALL connectivity::ado::ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception ) +css::uno::Reference< css::uno::XInterface > SAL_CALL connectivity::ado::ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) { return *(new ODriver(_rxFactory)); } -OUString SAL_CALL ODriver::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL ODriver::getImplementationName( ) { return getImplementationName_Static(); } -sal_Bool SAL_CALL ODriver::supportsService( const OUString& _rServiceName ) throw(RuntimeException) +sal_Bool SAL_CALL ODriver::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } -Sequence< OUString > SAL_CALL ODriver::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL ODriver::getSupportedServiceNames( ) { return getSupportedServiceNames_Static(); } -Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) { if ( ! acceptsURL(url) ) return nullptr; @@ -130,7 +130,6 @@ Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const S } sal_Bool SAL_CALL ODriver::acceptsURL( const OUString& url ) - throw(SQLException, RuntimeException) { return url.startsWith("sdbc:ado:"); } @@ -145,7 +144,7 @@ void ODriver::impl_checkURL_throw(const OUString& _sUrl) } // if ( !acceptsURL(_sUrl) ) } -Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException) +Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) { impl_checkURL_throw(url); if ( acceptsURL(url) ) @@ -182,18 +181,18 @@ Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString return Sequence< DriverPropertyInfo >(); } -sal_Int32 SAL_CALL ODriver::getMajorVersion( ) throw(RuntimeException) +sal_Int32 SAL_CALL ODriver::getMajorVersion( ) { return 1; } -sal_Int32 SAL_CALL ODriver::getMinorVersion( ) throw(RuntimeException) +sal_Int32 SAL_CALL ODriver::getMinorVersion( ) { return 0; } // XDataDefinitionSupplier -Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByConnection( const Reference< css::sdbc::XConnection >& connection ) throw(css::sdbc::SQLException, RuntimeException) +Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByConnection( const Reference< css::sdbc::XConnection >& connection ) { ::osl::MutexGuard aGuard( m_aMutex ); if (ODriver_BASE::rBHelper.bDisposed) @@ -233,14 +232,14 @@ Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByConnection( co return xTab; } -Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) throw(css::sdbc::SQLException, RuntimeException) +Reference< XTablesSupplier > SAL_CALL ODriver::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) { impl_checkURL_throw(url); return getDataDefinitionByConnection(connect(url,info)); } -void ADOS::ThrowException(ADOConnection* _pAdoCon,const Reference< XInterface >& _xInterface) throw(SQLException, RuntimeException) +void ADOS::ThrowException(ADOConnection* _pAdoCon,const Reference< XInterface >& _xInterface) { ADOErrors *pErrors = nullptr; _pAdoCon->get_Errors(&pErrors); diff --git a/connectivity/source/drivers/ado/AGroup.cxx b/connectivity/source/drivers/ado/AGroup.cxx index ab1eb1f3a9c0..f8c61dee557a 100644 --- a/connectivity/source/drivers/ado/AGroup.cxx +++ b/connectivity/source/drivers/ado/AGroup.cxx @@ -99,7 +99,7 @@ Sequence< sal_Int8 > OAdoGroup::getUnoTunnelImplementationId() // css::lang::XUnoTunnel -sal_Int64 OAdoGroup::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) +sal_Int64 OAdoGroup::getSomething( const Sequence< sal_Int8 > & rId ) { return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) ? reinterpret_cast< sal_Int64 >( this ) @@ -107,7 +107,7 @@ sal_Int64 OAdoGroup::getSomething( const Sequence< sal_Int8 > & rId ) throw (Run } -void OAdoGroup::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception) +void OAdoGroup::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) { if(m_aGroup.IsValid()) { @@ -139,12 +139,12 @@ void OAdoGroup::getFastPropertyValue(Any& rValue,sal_Int32 nHandle) const } -sal_Int32 SAL_CALL OAdoGroup::getPrivileges( const OUString& objName, sal_Int32 objType ) throw(css::sdbc::SQLException, RuntimeException) +sal_Int32 SAL_CALL OAdoGroup::getPrivileges( const OUString& objName, sal_Int32 objType ) { return MapRight(m_aGroup.GetPermissions(objName,MapObjectType(objType))); } -sal_Int32 SAL_CALL OAdoGroup::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(css::sdbc::SQLException, RuntimeException) +sal_Int32 SAL_CALL OAdoGroup::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) { RightsEnum eNum = m_aGroup.GetPermissions(objName,MapObjectType(objType)); if(eNum & adRightWithGrant) @@ -152,12 +152,12 @@ sal_Int32 SAL_CALL OAdoGroup::getGrantablePrivileges( const OUString& objName, s return 0; } -void SAL_CALL OAdoGroup::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(css::sdbc::SQLException, RuntimeException) +void SAL_CALL OAdoGroup::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) { m_aGroup.SetPermissions(objName,MapObjectType(objType),adAccessGrant,Map2Right(objPrivileges)); } -void SAL_CALL OAdoGroup::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(css::sdbc::SQLException, RuntimeException) +void SAL_CALL OAdoGroup::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) { m_aGroup.SetPermissions(objName,MapObjectType(objType),adAccessDeny,Map2Right(objPrivileges)); } diff --git a/connectivity/source/drivers/ado/AGroups.cxx b/connectivity/source/drivers/ado/AGroups.cxx index cc3208e232bf..2611ace16372 100644 --- a/connectivity/source/drivers/ado/AGroups.cxx +++ b/connectivity/source/drivers/ado/AGroups.cxx @@ -44,7 +44,7 @@ sdbcx::ObjectType OGroups::createObject(const OUString& _rName) return new OAdoGroup(m_pCatalog,isCaseSensitive(),_rName); } -void OGroups::impl_refresh() throw(RuntimeException) +void OGroups::impl_refresh() { m_aCollection.Refresh(); } diff --git a/connectivity/source/drivers/ado/AIndex.cxx b/connectivity/source/drivers/ado/AIndex.cxx index b907873cd443..b33f57ab3f6a 100644 --- a/connectivity/source/drivers/ado/AIndex.cxx +++ b/connectivity/source/drivers/ado/AIndex.cxx @@ -89,14 +89,14 @@ Sequence< sal_Int8 > OAdoIndex::getUnoTunnelImplementationId() // css::lang::XUnoTunnel -sal_Int64 OAdoIndex::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) +sal_Int64 OAdoIndex::getSomething( const Sequence< sal_Int8 > & rId ) { return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) ? reinterpret_cast< sal_Int64 >( this ) : sdbcx::OIndex::getSomething(rId); } -void SAL_CALL OAdoIndex::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception) +void SAL_CALL OAdoIndex::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) { if(m_aIndex.IsValid()) { diff --git a/connectivity/source/drivers/ado/AIndexes.cxx b/connectivity/source/drivers/ado/AIndexes.cxx index b931984bd182..5bf8937af21f 100644 --- a/connectivity/source/drivers/ado/AIndexes.cxx +++ b/connectivity/source/drivers/ado/AIndexes.cxx @@ -43,7 +43,7 @@ sdbcx::ObjectType OIndexes::createObject(const OUString& _rName) return new OAdoIndex(isCaseSensitive(),m_pConnection,m_aCollection.GetItem(_rName)); } -void OIndexes::impl_refresh() throw(RuntimeException) +void OIndexes::impl_refresh() { m_aCollection.Refresh(); } diff --git a/connectivity/source/drivers/ado/AKey.cxx b/connectivity/source/drivers/ado/AKey.cxx index cc1e13c1e5e8..2df0c8775a80 100644 --- a/connectivity/source/drivers/ado/AKey.cxx +++ b/connectivity/source/drivers/ado/AKey.cxx @@ -84,14 +84,14 @@ Sequence< sal_Int8 > OAdoKey::getUnoTunnelImplementationId() // css::lang::XUnoTunnel -sal_Int64 OAdoKey::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) +sal_Int64 OAdoKey::getSomething( const Sequence< sal_Int8 > & rId ) { return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) ? reinterpret_cast< sal_Int64 >( this ) : OKey_ADO::getSomething(rId); } -void OAdoKey::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception) +void OAdoKey::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) { if(m_aKey.IsValid()) { diff --git a/connectivity/source/drivers/ado/AKeys.cxx b/connectivity/source/drivers/ado/AKeys.cxx index 257c0be04602..4a48330d7f57 100644 --- a/connectivity/source/drivers/ado/AKeys.cxx +++ b/connectivity/source/drivers/ado/AKeys.cxx @@ -49,7 +49,7 @@ sdbcx::ObjectType OKeys::createObject(const OUString& _rName) return new OAdoKey(isCaseSensitive(),m_pConnection,m_aCollection.GetItem(_rName)); } -void OKeys::impl_refresh() throw(RuntimeException) +void OKeys::impl_refresh() { m_aCollection.Refresh(); } diff --git a/connectivity/source/drivers/ado/APreparedStatement.cxx b/connectivity/source/drivers/ado/APreparedStatement.cxx index a29e00d79fb5..136c3a90b377 100644 --- a/connectivity/source/drivers/ado/APreparedStatement.cxx +++ b/connectivity/source/drivers/ado/APreparedStatement.cxx @@ -92,7 +92,7 @@ OPreparedStatement::~OPreparedStatement() } } -Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) { Any aRet = OStatement_Base::queryInterface(rType); return aRet.hasValue() ? aRet : ::cppu::queryInterface( rType, @@ -101,7 +101,7 @@ Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(Runt static_cast< XResultSetMetaDataSupplier*>(this)); } -css::uno::Sequence< css::uno::Type > SAL_CALL OPreparedStatement::getTypes( ) throw(css::uno::RuntimeException) +css::uno::Sequence< css::uno::Type > SAL_CALL OPreparedStatement::getTypes( ) { ::cppu::OTypeCollection aTypes( cppu::UnoType::get(), cppu::UnoType::get(), @@ -110,7 +110,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL OPreparedStatement::getTypes( ) t return ::comphelper::concatSequences(aTypes.getTypes(),OStatement_Base::getTypes()); } -Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData( ) throw(SQLException, RuntimeException) +Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData( ) { if(!m_xMetaData.is() && m_RecordSet.IsValid()) m_xMetaData = new OResultSetMetaData(m_RecordSet); @@ -128,7 +128,7 @@ m_xMetaData.clear(); OStatement_Base::disposing(); } -void SAL_CALL OPreparedStatement::close( ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::close( ) { { @@ -140,7 +140,7 @@ void SAL_CALL OPreparedStatement::close( ) throw(SQLException, RuntimeException } -sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OPreparedStatement::execute( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -164,7 +164,7 @@ sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeExc return m_RecordSet.IsValid(); } -sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -183,7 +183,7 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) throw(SQLException, Run } void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const DataTypeEnum& _eType, - sal_Int32 _nSize,const OLEVariant& Val) throw(SQLException, RuntimeException) + sal_Int32 _nSize,const OLEVariant& Val) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -236,12 +236,12 @@ void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const DataTypeEn ADOS::ThrowException(*m_pConnection->getConnection(),*this); } -void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) { setParameter( parameterIndex, adLongVarWChar, ::std::numeric_limits< sal_Int32 >::max(), x ); } -Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -249,7 +249,7 @@ Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( ) throw(SQ return static_cast>(m_pConnection); } -Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -284,79 +284,79 @@ Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) throw(SQLE return xRs; } -void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) { setParameter(parameterIndex,adBoolean,sizeof(x),bool(x)); } -void SAL_CALL OPreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x ) { setParameter(parameterIndex,adTinyInt,sizeof(x),x); } -void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const Date& x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const Date& x ) { setParameter(parameterIndex,adDBDate,sizeof(x),x); } -void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const css::util::Time& x ) { setParameter(parameterIndex,adDBTime,sizeof(x),x); } -void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const DateTime& x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const DateTime& x ) { setParameter(parameterIndex,adDBTimeStamp,sizeof(x),x); } -void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) { setParameter(parameterIndex,adDouble,sizeof(x),x); } -void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) { setParameter(parameterIndex,adSingle,sizeof(x),x); } -void SAL_CALL OPreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x ) { setParameter(parameterIndex,adInteger,sizeof(x),x); } -void SAL_CALL OPreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x ) { setParameter(parameterIndex,adBigInt,sizeof(x),x); } -void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/ ) { OLEVariant aVal; aVal.setNull(); setParameter(parameterIndex,adEmpty,0,aVal); } -void SAL_CALL OPreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRowUpdate::setClob", *this ); } -void SAL_CALL OPreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const Reference< XBlob >& /*x*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const Reference< XBlob >& /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRowUpdate::setBlob", *this ); } -void SAL_CALL OPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRowUpdate::setArray", *this ); } -void SAL_CALL OPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRowUpdate::setRef", *this ); } -void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 sqlType, sal_Int32 scale ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 sqlType, sal_Int32 scale ) { switch(sqlType) { @@ -370,12 +370,12 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, c } } -void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) { setNull(parameterIndex,sqlType); } -void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) { if(!::dbtools::implSetObject(this,parameterIndex,x)) { @@ -387,22 +387,22 @@ void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any } } -void SAL_CALL OPreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x ) { setParameter(parameterIndex,adSmallInt,sizeof(x),x); } -void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x ) { setParameter(parameterIndex,adVarBinary,sizeof(sal_Int8)*x.getLength(),x); } -void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 /*parameterIndex*/, const Reference< css::io::XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 /*parameterIndex*/, const Reference< css::io::XInputStream >& /*x*/, sal_Int32 /*length*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setCharacterStream", *this ); } -void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) { if(x.is()) { @@ -412,7 +412,7 @@ void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, con } } -void SAL_CALL OPreparedStatement::clearParameters( ) throw(SQLException, RuntimeException) +void SAL_CALL OPreparedStatement::clearParameters( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/ado/AResultSet.cxx b/connectivity/source/drivers/ado/AResultSet.cxx index 46f1e86aca1c..1e2c5b76e44f 100644 --- a/connectivity/source/drivers/ado/AResultSet.cxx +++ b/connectivity/source/drivers/ado/AResultSet.cxx @@ -54,17 +54,17 @@ using namespace com::sun::star::sdbc; // IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.AResultSet","com.sun.star.sdbc.ResultSet"); -OUString SAL_CALL OResultSet::getImplementationName( ) throw (css::uno::RuntimeException) +OUString SAL_CALL OResultSet::getImplementationName( ) { return OUString("com.sun.star.sdbcx.ado.ResultSet"); } -css::uno::Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw(css::uno::RuntimeException) +css::uno::Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) { return {"com.sun.star.sdbc.ResultSet","com.sun.star.sdbcx.ResultSet"}; } -sal_Bool SAL_CALL OResultSet::supportsService( const OUString& _rServiceName ) throw(css::uno::RuntimeException) +sal_Bool SAL_CALL OResultSet::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } @@ -127,13 +127,13 @@ m_xStatement.clear(); m_xMetaData.clear(); } -Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL OResultSet::queryInterface( const Type & rType ) { Any aRet = OPropertySetHelper::queryInterface(rType); return aRet.hasValue() ? aRet : OResultSet_BASE::queryInterface(rType); } -css::uno::Sequence< css::uno::Type > SAL_CALL OResultSet::getTypes( ) throw(css::uno::RuntimeException) +css::uno::Sequence< css::uno::Type > SAL_CALL OResultSet::getTypes( ) { ::cppu::OTypeCollection aTypes( cppu::UnoType::get(), cppu::UnoType::get(), @@ -143,7 +143,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL OResultSet::getTypes( ) throw(css } -sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -165,7 +165,7 @@ sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQ } #define BLOCK_SIZE 256 -Reference< css::io::XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +Reference< css::io::XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -205,13 +205,13 @@ Reference< css::io::XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int return m_aValue.isNull() ? nullptr : new ::comphelper::SequenceInputStream(m_aValue.getByteSequence()); } -Reference< css::io::XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< css::io::XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getCharacterStream", *this ); return nullptr; } -OLEVariant OResultSet::getValue(sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +OLEVariant OResultSet::getValue(sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -221,49 +221,49 @@ OLEVariant OResultSet::getValue(sal_Int32 columnIndex ) throw(SQLException, Runt return m_aValue; } -sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 columnIndex ) { return getValue(columnIndex).getBool(); } -sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 columnIndex ) { return getValue(columnIndex).getInt8(); } -Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) { return getValue(columnIndex).getByteSequence(); } -css::util::Date SAL_CALL OResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +css::util::Date SAL_CALL OResultSet::getDate( sal_Int32 columnIndex ) { return getValue(columnIndex).getDate(); } -double SAL_CALL OResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +double SAL_CALL OResultSet::getDouble( sal_Int32 columnIndex ) { return getValue(columnIndex).getDouble(); } -float SAL_CALL OResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +float SAL_CALL OResultSet::getFloat( sal_Int32 columnIndex ) { return getValue(columnIndex).getFloat(); } -sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 columnIndex ) { return getValue(columnIndex).getInt32(); } -sal_Int32 SAL_CALL OResultSet::getRow( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSet::getRow( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -276,14 +276,14 @@ sal_Int32 SAL_CALL OResultSet::getRow( ) throw(SQLException, RuntimeException) } -sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getLong", *this ); return sal_Int64(0); } -Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) throw(SQLException, RuntimeException) +Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -294,64 +294,64 @@ Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) throw(SQLEx return m_xMetaData; } -Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getArray", *this ); return nullptr; } -Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getClob", *this ); return nullptr; } -Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getBlob", *this ); return nullptr; } -Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) +Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRow::getRef", *this ); return nullptr; } -Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) +Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ ) { return getValue(columnIndex).makeAny(); } -sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex ) { return getValue(columnIndex).getInt16(); } -OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) { return getValue(columnIndex).getString(); } -css::util::Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +css::util::Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) { return getValue(columnIndex).getTime(); } -css::util::DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +css::util::DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 columnIndex ) { return getValue(columnIndex).getDateTime(); } -sal_Bool SAL_CALL OResultSet::isAfterLast( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::isAfterLast( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -362,7 +362,7 @@ sal_Bool SAL_CALL OResultSet::isAfterLast( ) throw(SQLException, RuntimeExcepti return bIsAtEOF == VARIANT_TRUE; } -sal_Bool SAL_CALL OResultSet::isFirst( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::isFirst( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -371,7 +371,7 @@ sal_Bool SAL_CALL OResultSet::isFirst( ) throw(SQLException, RuntimeException) return m_nRowPos == 1; } -sal_Bool SAL_CALL OResultSet::isLast( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::isLast( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -380,7 +380,7 @@ sal_Bool SAL_CALL OResultSet::isLast( ) throw(SQLException, RuntimeException) return true; } -void SAL_CALL OResultSet::beforeFirst( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::beforeFirst( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -390,7 +390,7 @@ void SAL_CALL OResultSet::beforeFirst( ) throw(SQLException, RuntimeException) m_bOnFirstAfterOpen = !previous(); } -void SAL_CALL OResultSet::afterLast( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::afterLast( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -402,7 +402,7 @@ void SAL_CALL OResultSet::afterLast( ) throw(SQLException, RuntimeException) } -void SAL_CALL OResultSet::close( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::close( ) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -413,7 +413,7 @@ void SAL_CALL OResultSet::close( ) throw(SQLException, RuntimeException) } -sal_Bool SAL_CALL OResultSet::first( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::first( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -429,7 +429,7 @@ sal_Bool SAL_CALL OResultSet::first( ) throw(SQLException, RuntimeException) } -sal_Bool SAL_CALL OResultSet::last( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::last( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -444,7 +444,7 @@ sal_Bool SAL_CALL OResultSet::last( ) throw(SQLException, RuntimeException) return bRet; } -sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -477,7 +477,7 @@ sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, Runt return bCheck; } -sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -497,7 +497,7 @@ sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, Runt return bRet; } -sal_Bool SAL_CALL OResultSet::previous( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::previous( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -511,7 +511,7 @@ sal_Bool SAL_CALL OResultSet::previous( ) throw(SQLException, RuntimeException) return bRet; } -Reference< XInterface > SAL_CALL OResultSet::getStatement( ) throw(SQLException, RuntimeException) +Reference< XInterface > SAL_CALL OResultSet::getStatement( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -519,7 +519,7 @@ Reference< XInterface > SAL_CALL OResultSet::getStatement( ) throw(SQLException } -sal_Bool SAL_CALL OResultSet::rowDeleted( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::rowDeleted( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -533,7 +533,7 @@ sal_Bool SAL_CALL OResultSet::rowDeleted( ) throw(SQLException, RuntimeExceptio return bRet; } -sal_Bool SAL_CALL OResultSet::rowInserted( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::rowInserted( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -546,7 +546,7 @@ sal_Bool SAL_CALL OResultSet::rowInserted( ) throw(SQLException, RuntimeExcepti return bRet; } -sal_Bool SAL_CALL OResultSet::rowUpdated( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::rowUpdated( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -558,7 +558,7 @@ sal_Bool SAL_CALL OResultSet::rowUpdated( ) throw(SQLException, RuntimeExceptio } -sal_Bool SAL_CALL OResultSet::isBeforeFirst( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::isBeforeFirst( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -575,7 +575,7 @@ sal_Bool SAL_CALL OResultSet::isBeforeFirst( ) throw(SQLException, RuntimeExcep } -sal_Bool SAL_CALL OResultSet::next( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::next( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -606,7 +606,7 @@ sal_Bool SAL_CALL OResultSet::next( ) throw(SQLException, RuntimeException) } -sal_Bool SAL_CALL OResultSet::wasNull( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::wasNull( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -616,7 +616,7 @@ sal_Bool SAL_CALL OResultSet::wasNull( ) throw(SQLException, RuntimeException) } -void SAL_CALL OResultSet::cancel( ) throw(RuntimeException) +void SAL_CALL OResultSet::cancel( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -625,16 +625,16 @@ void SAL_CALL OResultSet::cancel( ) throw(RuntimeException) m_pRecordSet->Cancel(); } -void SAL_CALL OResultSet::clearWarnings( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::clearWarnings( ) { } -Any SAL_CALL OResultSet::getWarnings( ) throw(SQLException, RuntimeException) +Any SAL_CALL OResultSet::getWarnings( ) { return Any(); } -void SAL_CALL OResultSet::insertRow( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::insertRow( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -645,7 +645,7 @@ void SAL_CALL OResultSet::insertRow( ) throw(SQLException, RuntimeException) m_pRecordSet->AddNew(aEmpty,aEmpty); } -void SAL_CALL OResultSet::updateRow( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateRow( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -656,7 +656,7 @@ void SAL_CALL OResultSet::updateRow( ) throw(SQLException, RuntimeException) m_pRecordSet->Update(aEmpty,aEmpty); } -void SAL_CALL OResultSet::deleteRow( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::deleteRow( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -667,7 +667,7 @@ void SAL_CALL OResultSet::deleteRow( ) throw(SQLException, RuntimeException) } -void SAL_CALL OResultSet::cancelRowUpdates( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::cancelRowUpdates( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -677,7 +677,7 @@ void SAL_CALL OResultSet::cancelRowUpdates( ) throw(SQLException, RuntimeExcept } -void SAL_CALL OResultSet::moveToInsertRow( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::moveToInsertRow( ) { // ::osl::MutexGuard aGuard( m_aMutex ); //checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -686,7 +686,7 @@ void SAL_CALL OResultSet::moveToInsertRow( ) throw(SQLException, RuntimeExcepti } -void SAL_CALL OResultSet::moveToCurrentRow( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::moveToCurrentRow( ) { } @@ -699,7 +699,7 @@ void OResultSet::updateValue(sal_Int32 columnIndex,const OLEVariant& x) aField.PutValue(x); } -void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) { OLEVariant x; x.setNull(); @@ -707,72 +707,72 @@ void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException } -void SAL_CALL OResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) { updateValue(columnIndex,bool(x)); } -void SAL_CALL OResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateFloat( sal_Int32 columnIndex, float x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateDouble( sal_Int32 columnIndex, double x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateBytes( sal_Int32 columnIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateBytes( sal_Int32 columnIndex, const Sequence< sal_Int8 >& x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const css::util::Date& x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const css::util::Time& x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) { if(!x.is()) ::dbtools::throwFunctionSequenceException(*this); @@ -782,7 +782,7 @@ void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Refer updateBytes(columnIndex,aSeq); } -void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) { if(!x.is()) ::dbtools::throwFunctionSequenceException(*this); @@ -792,7 +792,7 @@ void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Re updateBytes(columnIndex,aSeq); } -void SAL_CALL OResultSet::refreshRow( ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::refreshRow( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -801,21 +801,21 @@ void SAL_CALL OResultSet::refreshRow( ) throw(SQLException, RuntimeException) m_pRecordSet->Resync(adAffectCurrent); } -void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) { if (!::dbtools::implUpdateObject(this, columnIndex, x)) throw SQLException(); } -void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 /*scale*/ ) throw(SQLException, RuntimeException) +void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 /*scale*/ ) { if (!::dbtools::implUpdateObject(this, columnIndex, x)) throw SQLException(); } // XRowLocate -Any SAL_CALL OResultSet::getBookmark( ) throw(SQLException, RuntimeException) +Any SAL_CALL OResultSet::getBookmark( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -830,7 +830,7 @@ Any SAL_CALL OResultSet::getBookmark( ) throw(SQLException, RuntimeException) } -sal_Bool SAL_CALL OResultSet::moveToBookmark( const Any& bookmark ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::moveToBookmark( const Any& bookmark ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -845,7 +845,7 @@ sal_Bool SAL_CALL OResultSet::moveToBookmark( const Any& bookmark ) throw(SQLExc return SUCCEEDED(m_pRecordSet->Move(0,m_aBookmarks[nPos])); } -sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -860,7 +860,7 @@ sal_Bool SAL_CALL OResultSet::moveRelativeToBookmark( const Any& bookmark, sal_I return SUCCEEDED(m_pRecordSet->Move(rows,m_aBookmarks[nPos])); } -sal_Int32 SAL_CALL OResultSet::compareBookmarks( const Any& bookmark1, const Any& bookmark2 ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSet::compareBookmarks( const Any& bookmark1, const Any& bookmark2 ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -879,7 +879,7 @@ sal_Int32 SAL_CALL OResultSet::compareBookmarks( const Any& bookmark1, const Any return ((sal_Int32)eNum) - 1; } -sal_Bool SAL_CALL OResultSet::hasOrderedBookmarks( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSet::hasOrderedBookmarks( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -905,7 +905,7 @@ sal_Bool SAL_CALL OResultSet::hasOrderedBookmarks( ) throw(SQLException, Runtim return bValue; } -sal_Int32 SAL_CALL OResultSet::hashBookmark( const Any& bookmark ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSet::hashBookmark( const Any& bookmark ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -917,7 +917,7 @@ sal_Int32 SAL_CALL OResultSet::hashBookmark( const Any& bookmark ) throw(SQLExce } // XDeleteRows -Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows( const Sequence< Any >& rows ) throw(SQLException, RuntimeException) +Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows( const Sequence< Any >& rows ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -966,7 +966,6 @@ Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows( const Sequence< Any >& ro } sal_Int32 OResultSet::getResultSetConcurrency() const - throw(css::sdbc::SQLException, css::uno::RuntimeException) { sal_Int32 nValue=ResultSetConcurrency::READ_ONLY; LockTypeEnum eRet; @@ -986,7 +985,6 @@ sal_Int32 OResultSet::getResultSetConcurrency() const } sal_Int32 OResultSet::getResultSetType() const - throw(css::sdbc::SQLException, css::uno::RuntimeException) { sal_Int32 nValue=0; CursorTypeEnum eRet; @@ -1011,13 +1009,11 @@ sal_Int32 OResultSet::getResultSetType() const } sal_Int32 OResultSet::getFetchDirection() - throw(css::sdbc::SQLException, css::uno::RuntimeException) { return FetchDirection::FORWARD; } sal_Int32 OResultSet::getFetchSize() const - throw(css::sdbc::SQLException, css::uno::RuntimeException) { sal_Int32 nValue=-1; m_pRecordSet->get_CacheSize(&nValue); @@ -1025,20 +1021,17 @@ sal_Int32 OResultSet::getFetchSize() const } OUString OResultSet::getCursorName() - throw(css::sdbc::SQLException, css::uno::RuntimeException) { return OUString(); } void OResultSet::setFetchDirection(sal_Int32 /*_par0*/) - throw(css::sdbc::SQLException, css::uno::RuntimeException) { ::dbtools::throwFeatureNotImplementedSQLException( "ResultSet::FetchDirection", *this ); } void OResultSet::setFetchSize(sal_Int32 _par0) - throw(css::sdbc::SQLException, css::uno::RuntimeException) { m_pRecordSet->put_CacheSize(_par0); } @@ -1077,7 +1070,6 @@ sal_Bool OResultSet::convertFastPropertyValue( Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) - throw (css::lang::IllegalArgumentException) { switch(nHandle) { @@ -1097,7 +1089,7 @@ sal_Bool OResultSet::convertFastPropertyValue( return false; } -void OResultSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception) +void OResultSet::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) { switch(nHandle) { @@ -1157,7 +1149,7 @@ void SAL_CALL OResultSet::release() throw() OResultSet_BASE::release(); } -css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo( ) throw(css::uno::RuntimeException) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/ado/AResultSetMetaData.cxx b/connectivity/source/drivers/ado/AResultSetMetaData.cxx index dc0b046c3552..37e7b2d2e3b2 100644 --- a/connectivity/source/drivers/ado/AResultSetMetaData.cxx +++ b/connectivity/source/drivers/ado/AResultSetMetaData.cxx @@ -44,7 +44,7 @@ OResultSetMetaData::~OResultSetMetaData() m_pRecordSet->Release(); } -sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) { WpADOField aField = ADOS::getField(m_pRecordSet,column); if(aField.IsValid() && aField.GetActualSize() != -1) @@ -53,14 +53,14 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) } -sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 column ) { WpADOField aField = ADOS::getField(m_pRecordSet,column); return ADOS::MapADOType2Jdbc(aField.GetADOType()); } -sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount( ) { if(m_nColCount != -1 ) return m_nColCount; @@ -76,7 +76,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount( ) throw(SQLException, Ru } -sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 column ) { bool bRet = false; WpADOField aField = ADOS::getField(m_pRecordSet,column); @@ -90,13 +90,13 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw( } -OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) { return OUString(); } -OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) { WpADOField aField = ADOS::getField(m_pRecordSet,column); if(aField.IsValid()) @@ -105,7 +105,7 @@ OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQ return OUString(); } -OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 column ) { OUString sTableName; @@ -119,28 +119,28 @@ OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 column ) throw(SQL return sTableName; } -OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) { return OUString(); } -OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 /*column*/ ) { return OUString(); } -OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) { return getColumnName(column); } -OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) { return OUString(); } -sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) { WpADOField aField = ADOS::getField(m_pRecordSet,column); if(aField.IsValid()) @@ -151,7 +151,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLEx } -sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 column ) { bool bRet = false; WpADOField aField = ADOS::getField(m_pRecordSet,column); @@ -167,7 +167,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw( } -sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 column ) { WpADOField aField = ADOS::getField(m_pRecordSet,column); if(aField.IsValid()) @@ -178,7 +178,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLExce return false; } -sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) { WpADOField aField = ADOS::getField(m_pRecordSet,column); if(aField.IsValid()) @@ -186,7 +186,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQ return 0; } -sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) +sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) { WpADOField aField = ADOS::getField(m_pRecordSet,column); if(aField.IsValid()) @@ -195,7 +195,7 @@ sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(css::s } -sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) { WpADOField aField = ADOS::getField(m_pRecordSet,column); if(aField.IsValid()) @@ -206,13 +206,13 @@ sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLE } -sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 /*column*/ ) { return true; } -sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) { WpADOField aField = ADOS::getField(m_pRecordSet,column); if(aField.IsValid()) @@ -223,7 +223,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLEx } -sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) { WpADOField aField = ADOS::getField(m_pRecordSet,column); if(aField.IsValid()) @@ -234,7 +234,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) t ; } -sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) { return isDefinitelyWritable(column); } diff --git a/connectivity/source/drivers/ado/AStatement.cxx b/connectivity/source/drivers/ado/AStatement.cxx index 2afe88141be7..025be1b95b37 100644 --- a/connectivity/source/drivers/ado/AStatement.cxx +++ b/connectivity/source/drivers/ado/AStatement.cxx @@ -113,13 +113,13 @@ void SAL_CALL OStatement_Base::release() throw() release_ChildImpl(); } -Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) { Any aRet = OStatement_BASE::queryInterface(rType); return aRet.hasValue() ? aRet : OPropertySetHelper::queryInterface(rType); } -css::uno::Sequence< css::uno::Type > SAL_CALL OStatement_Base::getTypes( ) throw(css::uno::RuntimeException) +css::uno::Sequence< css::uno::Type > SAL_CALL OStatement_Base::getTypes( ) { ::cppu::OTypeCollection aTypes( cppu::UnoType::get(), cppu::UnoType::get(), @@ -129,7 +129,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL OStatement_Base::getTypes( ) thro } -void SAL_CALL OStatement_Base::cancel( ) throw(RuntimeException) +void SAL_CALL OStatement_Base::cancel( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -139,7 +139,7 @@ void SAL_CALL OStatement_Base::cancel( ) throw(RuntimeException) } -void SAL_CALL OStatement_Base::close( ) throw(SQLException, RuntimeException) +void SAL_CALL OStatement_Base::close( ) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -150,13 +150,13 @@ void SAL_CALL OStatement_Base::close( ) throw(SQLException, RuntimeException) } -void SAL_CALL OStatement::clearBatch( ) throw(SQLException, RuntimeException) +void SAL_CALL OStatement::clearBatch( ) { } -void OStatement_Base::reset() throw (SQLException) +void OStatement_Base::reset() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -172,7 +172,7 @@ void OStatement_Base::reset() throw (SQLException) // If a ResultSet was created for this Statement, close it -void OStatement_Base::clearMyResultSet () throw (SQLException) +void OStatement_Base::clearMyResultSet () { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -189,7 +189,7 @@ void OStatement_Base::clearMyResultSet () throw (SQLException) m_xResultSet.clear(); } -sal_Int32 OStatement_Base::getRowCount () throw( SQLException) +sal_Int32 OStatement_Base::getRowCount () { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -228,7 +228,7 @@ sal_Int32 OStatement_Base::getPrecision ( sal_Int32 sqlType) // Sets the warning -void OStatement_Base::setWarning (const SQLWarning &ex) throw( SQLException) +void OStatement_Base::setWarning (const SQLWarning &ex) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -249,7 +249,7 @@ void OStatement_Base::assignRecordSet( ADORecordset* _pRS ) m_RecordSet.PutRefDataSource( static_cast(m_Command) ); } -sal_Bool SAL_CALL OStatement_Base::execute( const OUString& sql ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OStatement_Base::execute( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -279,7 +279,7 @@ sal_Bool SAL_CALL OStatement_Base::execute( const OUString& sql ) throw(SQLExcep return m_RecordSet.IsValid(); } -Reference< XResultSet > SAL_CALL OStatement_Base::executeQuery( const OUString& sql ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL OStatement_Base::executeQuery( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -316,7 +316,7 @@ Reference< XResultSet > SAL_CALL OStatement_Base::executeQuery( const OUString& } -Reference< XConnection > SAL_CALL OStatement_Base::getConnection( ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL OStatement_Base::getConnection( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -326,14 +326,14 @@ Reference< XConnection > SAL_CALL OStatement_Base::getConnection( ) throw(SQLEx } -Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeException) +Any SAL_CALL OStatement::queryInterface( const Type & rType ) { Any aRet = ::cppu::queryInterface(rType,static_cast< XBatchExecution*> (this)); return aRet.hasValue() ? aRet : OStatement_Base::queryInterface(rType); } -void SAL_CALL OStatement::addBatch( const OUString& sql ) throw(SQLException, RuntimeException) +void SAL_CALL OStatement::addBatch( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -342,7 +342,7 @@ void SAL_CALL OStatement::addBatch( const OUString& sql ) throw(SQLException, Ru m_aBatchList.push_back(sql); } -Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch( ) throw(SQLException, RuntimeException) +Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -387,7 +387,7 @@ Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch( ) throw(SQLException, } -sal_Int32 SAL_CALL OStatement_Base::executeUpdate( const OUString& sql ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OStatement_Base::executeUpdate( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -414,7 +414,7 @@ sal_Int32 SAL_CALL OStatement_Base::executeUpdate( const OUString& sql ) throw(S } -Reference< XResultSet > SAL_CALL OStatement_Base::getResultSet( ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL OStatement_Base::getResultSet( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -424,7 +424,7 @@ Reference< XResultSet > SAL_CALL OStatement_Base::getResultSet( ) throw(SQLExce } -sal_Int32 SAL_CALL OStatement_Base::getUpdateCount( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OStatement_Base::getUpdateCount( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -437,7 +437,7 @@ sal_Int32 SAL_CALL OStatement_Base::getUpdateCount( ) throw(SQLException, Runti } -sal_Bool SAL_CALL OStatement_Base::getMoreResults( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL OStatement_Base::getMoreResults( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -470,7 +470,7 @@ sal_Bool SAL_CALL OStatement_Base::getMoreResults( ) throw(SQLException, Runtim } -Any SAL_CALL OStatement_Base::getWarnings( ) throw(SQLException, RuntimeException) +Any SAL_CALL OStatement_Base::getWarnings( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -480,7 +480,7 @@ Any SAL_CALL OStatement_Base::getWarnings( ) throw(SQLException, RuntimeExcepti } -void SAL_CALL OStatement_Base::clearWarnings( ) throw(SQLException, RuntimeException) +void SAL_CALL OStatement_Base::clearWarnings( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -490,12 +490,12 @@ void SAL_CALL OStatement_Base::clearWarnings( ) throw(SQLException, RuntimeExce } -sal_Int32 OStatement_Base::getQueryTimeOut() const throw(SQLException, RuntimeException) +sal_Int32 OStatement_Base::getQueryTimeOut() const { return m_Command.get_CommandTimeout(); } -sal_Int32 OStatement_Base::getMaxRows() const throw(SQLException, RuntimeException) +sal_Int32 OStatement_Base::getMaxRows() const { ADO_LONGPTR nRet=-1; if(!(m_RecordSet.IsValid() && m_RecordSet.get_MaxRecords(nRet))) @@ -503,7 +503,7 @@ sal_Int32 OStatement_Base::getMaxRows() const throw(SQLException, RuntimeExcepti return nRet; } -sal_Int32 OStatement_Base::getResultSetConcurrency() const throw(SQLException, RuntimeException) +sal_Int32 OStatement_Base::getResultSetConcurrency() const { sal_Int32 nValue; @@ -520,7 +520,7 @@ sal_Int32 OStatement_Base::getResultSetConcurrency() const throw(SQLException, R return nValue; } -sal_Int32 OStatement_Base::getResultSetType() const throw(SQLException, RuntimeException) +sal_Int32 OStatement_Base::getResultSetType() const { sal_Int32 nValue=0; switch(m_eCursorType) @@ -540,27 +540,27 @@ sal_Int32 OStatement_Base::getResultSetType() const throw(SQLException, RuntimeE return nValue; } -sal_Int32 OStatement_Base::getFetchDirection() throw(SQLException, RuntimeException) +sal_Int32 OStatement_Base::getFetchDirection() { return FetchDirection::FORWARD; } -sal_Int32 OStatement_Base::getFetchSize() const throw(SQLException, RuntimeException) +sal_Int32 OStatement_Base::getFetchSize() const { return m_nFetchSize; } -sal_Int32 OStatement_Base::getMaxFieldSize() throw(SQLException, RuntimeException) +sal_Int32 OStatement_Base::getMaxFieldSize() { return 0; } -OUString OStatement_Base::getCursorName() const throw(SQLException, RuntimeException) +OUString OStatement_Base::getCursorName() const { return m_Command.GetName(); } -void OStatement_Base::setQueryTimeOut(sal_Int32 seconds) throw(SQLException, RuntimeException) +void OStatement_Base::setQueryTimeOut(sal_Int32 seconds) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -569,7 +569,7 @@ void OStatement_Base::setQueryTimeOut(sal_Int32 seconds) throw(SQLException, Run m_Command.put_CommandTimeout(seconds); } -void OStatement_Base::setMaxRows(sal_Int32 _par0) throw(SQLException, RuntimeException) +void OStatement_Base::setMaxRows(sal_Int32 _par0) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -577,7 +577,7 @@ void OStatement_Base::setMaxRows(sal_Int32 _par0) throw(SQLException, RuntimeExc m_nMaxRows = _par0; } -void OStatement_Base::setResultSetConcurrency(sal_Int32 _par0) throw(SQLException, RuntimeException) +void OStatement_Base::setResultSetConcurrency(sal_Int32 _par0) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -593,7 +593,7 @@ void OStatement_Base::setResultSetConcurrency(sal_Int32 _par0) throw(SQLExceptio } } -void OStatement_Base::setResultSetType(sal_Int32 _par0) throw(SQLException, RuntimeException) +void OStatement_Base::setResultSetType(sal_Int32 _par0) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -613,14 +613,14 @@ void OStatement_Base::setResultSetType(sal_Int32 _par0) throw(SQLException, Runt } } -void OStatement_Base::setFetchDirection(sal_Int32 /*_par0*/) throw(SQLException, RuntimeException) +void OStatement_Base::setFetchDirection(sal_Int32 /*_par0*/) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); ::dbtools::throwFeatureNotImplementedSQLException( "Statement::FetchDirection", *this ); } -void OStatement_Base::setFetchSize(sal_Int32 _par0) throw(SQLException, RuntimeException) +void OStatement_Base::setFetchSize(sal_Int32 _par0) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -629,14 +629,14 @@ void OStatement_Base::setFetchSize(sal_Int32 _par0) throw(SQLException, RuntimeE m_nFetchSize = _par0; } -void OStatement_Base::setMaxFieldSize(sal_Int32 /*_par0*/) throw(SQLException, RuntimeException) +void OStatement_Base::setMaxFieldSize(sal_Int32 /*_par0*/) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); ::dbtools::throwFeatureNotImplementedSQLException( "Statement::MaxFieldSize", *this ); } -void OStatement_Base::setCursorName(const OUString &_par0) throw(SQLException, RuntimeException) +void OStatement_Base::setCursorName(const OUString &_par0) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -685,7 +685,6 @@ sal_Bool OStatement_Base::convertFastPropertyValue( Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) - throw (css::lang::IllegalArgumentException) { bool bModified = false; @@ -734,7 +733,7 @@ sal_Bool OStatement_Base::convertFastPropertyValue( return bModified; } -void OStatement_Base::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception) +void OStatement_Base::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) { switch(nHandle) { @@ -828,7 +827,7 @@ void SAL_CALL OStatement::release() throw() OStatement_Base::release(); } -css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OStatement_Base::getPropertySetInfo( ) throw(css::uno::RuntimeException) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OStatement_Base::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/ado/ATable.cxx b/connectivity/source/drivers/ado/ATable.cxx index 23ddfff70979..6ef5fb391462 100644 --- a/connectivity/source/drivers/ado/ATable.cxx +++ b/connectivity/source/drivers/ado/ATable.cxx @@ -141,7 +141,7 @@ Sequence< sal_Int8 > OAdoTable::getUnoTunnelImplementationId() // css::lang::XUnoTunnel -sal_Int64 OAdoTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) +sal_Int64 OAdoTable::getSomething( const Sequence< sal_Int8 > & rId ) { return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) ? reinterpret_cast< sal_Int64 >( this ) @@ -149,7 +149,7 @@ sal_Int64 OAdoTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (Run } // XRename -void SAL_CALL OAdoTable::rename( const OUString& newName ) throw(SQLException, ElementExistException, RuntimeException) +void SAL_CALL OAdoTable::rename( const OUString& newName ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OTableDescriptor_BASE_TYPEDEF::rBHelper.bDisposed); @@ -166,7 +166,7 @@ Reference< XDatabaseMetaData> OAdoTable::getMetaData() const } // XAlterTable -void SAL_CALL OAdoTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException) +void SAL_CALL OAdoTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OTableDescriptor_BASE_TYPEDEF::rBHelper.bDisposed); @@ -186,7 +186,7 @@ void SAL_CALL OAdoTable::alterColumnByName( const OUString& colName, const Refer refreshColumns(); } -void SAL_CALL OAdoTable::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor ) throw(SQLException, css::lang::IndexOutOfBoundsException, RuntimeException) +void SAL_CALL OAdoTable::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OTableDescriptor_BASE_TYPEDEF::rBHelper.bDisposed); @@ -197,7 +197,7 @@ void SAL_CALL OAdoTable::alterColumnByIndex( sal_Int32 index, const Reference< X alterColumnByName(getString(xOld->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))),descriptor); } -void OAdoTable::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception) +void OAdoTable::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) { if(m_aTable.IsValid()) { @@ -229,7 +229,7 @@ void OAdoTable::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rV OTable_TYPEDEF::setFastPropertyValue_NoBroadcast(nHandle,rValue); } -OUString SAL_CALL OAdoTable::getName() throw(css::uno::RuntimeException) +OUString SAL_CALL OAdoTable::getName() { return m_aTable.get_Name(); } diff --git a/connectivity/source/drivers/ado/ATables.cxx b/connectivity/source/drivers/ado/ATables.cxx index bc3e9883578b..6f0a502642fb 100644 --- a/connectivity/source/drivers/ado/ATables.cxx +++ b/connectivity/source/drivers/ado/ATables.cxx @@ -49,7 +49,7 @@ sdbcx::ObjectType OTables::createObject(const OUString& _rName) return new OAdoTable(this,isCaseSensitive(),m_pCatalog,m_aCollection.GetItem(_rName)); } -void OTables::impl_refresh( ) throw(RuntimeException) +void OTables::impl_refresh( ) { OSL_ENSURE(m_aCollection.IsValid(),"Collection isn't valid"); m_aCollection.Refresh(); diff --git a/connectivity/source/drivers/ado/AUser.cxx b/connectivity/source/drivers/ado/AUser.cxx index d874eb2638b6..447789f6a8fb 100644 --- a/connectivity/source/drivers/ado/AUser.cxx +++ b/connectivity/source/drivers/ado/AUser.cxx @@ -83,7 +83,7 @@ Sequence< sal_Int8 > OAdoUser::getUnoTunnelImplementationId() // css::lang::XUnoTunnel -sal_Int64 OAdoUser::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) +sal_Int64 OAdoUser::getSomething( const Sequence< sal_Int8 > & rId ) { return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) ? reinterpret_cast< sal_Int64 >( this ) @@ -91,7 +91,7 @@ sal_Int64 OAdoUser::getSomething( const Sequence< sal_Int8 > & rId ) throw (Runt } -void OAdoUser::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue)throw (Exception) +void OAdoUser::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) { if(m_aUser.IsValid()) { @@ -151,7 +151,7 @@ cppu::IPropertyArrayHelper & OUserExtend::getInfoHelper() return *OUserExtend_PROP::getArrayHelper(); } -sal_Int32 SAL_CALL OAdoUser::getPrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OAdoUser::getPrivileges( const OUString& objName, sal_Int32 objType ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed); @@ -159,7 +159,7 @@ sal_Int32 SAL_CALL OAdoUser::getPrivileges( const OUString& objName, sal_Int32 o return ADOS::mapAdoRights2Sdbc(m_aUser.GetPermissions(objName, ADOS::mapObjectType2Ado(objType))); } -sal_Int32 SAL_CALL OAdoUser::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL OAdoUser::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed); @@ -172,7 +172,7 @@ sal_Int32 SAL_CALL OAdoUser::getGrantablePrivileges( const OUString& objName, sa return nRights; } -void SAL_CALL OAdoUser::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException) +void SAL_CALL OAdoUser::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed); @@ -180,7 +180,7 @@ void SAL_CALL OAdoUser::grantPrivileges( const OUString& objName, sal_Int32 objT ADOS::ThrowException(*m_pCatalog->getConnection()->getConnection(),*this); } -void SAL_CALL OAdoUser::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException) +void SAL_CALL OAdoUser::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed); @@ -189,7 +189,7 @@ void SAL_CALL OAdoUser::revokePrivileges( const OUString& objName, sal_Int32 obj } // XUser -void SAL_CALL OAdoUser::changePassword( const OUString& objPassword, const OUString& newPassword ) throw(SQLException, RuntimeException) +void SAL_CALL OAdoUser::changePassword( const OUString& objPassword, const OUString& newPassword ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/ado/AUsers.cxx b/connectivity/source/drivers/ado/AUsers.cxx index b136fe944d9a..74c22bd520d5 100644 --- a/connectivity/source/drivers/ado/AUsers.cxx +++ b/connectivity/source/drivers/ado/AUsers.cxx @@ -42,7 +42,7 @@ sdbcx::ObjectType OUsers::createObject(const OUString& _rName) return new OAdoUser(m_pCatalog,isCaseSensitive(),_rName); } -void OUsers::impl_refresh() throw(RuntimeException) +void OUsers::impl_refresh() { m_aCollection.Refresh(); } diff --git a/connectivity/source/drivers/ado/AView.cxx b/connectivity/source/drivers/ado/AView.cxx index 494e2dda8fc8..f39e93577597 100644 --- a/connectivity/source/drivers/ado/AView.cxx +++ b/connectivity/source/drivers/ado/AView.cxx @@ -58,7 +58,7 @@ Sequence< sal_Int8 > OAdoView::getUnoTunnelImplementationId() // css::lang::XUnoTunnel -sal_Int64 OAdoView::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException) +sal_Int64 OAdoView::getSomething( const Sequence< sal_Int8 > & rId ) { return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) ? reinterpret_cast< sal_Int64 >( this ) diff --git a/connectivity/source/drivers/ado/AViews.cxx b/connectivity/source/drivers/ado/AViews.cxx index fb3336e2f2a3..d15fbf631657 100644 --- a/connectivity/source/drivers/ado/AViews.cxx +++ b/connectivity/source/drivers/ado/AViews.cxx @@ -45,7 +45,7 @@ sdbcx::ObjectType OViews::createObject(const OUString& _rName) return pView; } -void OViews::impl_refresh( ) throw(RuntimeException) +void OViews::impl_refresh( ) { m_aCollection.Refresh(); } diff --git a/connectivity/source/drivers/ado/adoimp.cxx b/connectivity/source/drivers/ado/adoimp.cxx index 51498dacfd24..f7e2667b3cdb 100644 --- a/connectivity/source/drivers/ado/adoimp.cxx +++ b/connectivity/source/drivers/ado/adoimp.cxx @@ -305,7 +305,7 @@ sal_Int32 ADOS::mapRights2Ado(sal_Int32 nRights) return eRights; } -WpADOField ADOS::getField(ADORecordset* _pRecordSet,sal_Int32 _nColumnIndex) throw(css::sdbc::SQLException, css::uno::RuntimeException) +WpADOField ADOS::getField(ADORecordset* _pRecordSet,sal_Int32 _nColumnIndex) { if ( !_pRecordSet ) return WpADOField(); diff --git a/connectivity/source/drivers/calc/CConnection.cxx b/connectivity/source/drivers/calc/CConnection.cxx index c187256ecbda..04b37c071993 100644 --- a/connectivity/source/drivers/calc/CConnection.cxx +++ b/connectivity/source/drivers/calc/CConnection.cxx @@ -60,7 +60,6 @@ OCalcConnection::~OCalcConnection() } void OCalcConnection::construct(const OUString& url,const Sequence< PropertyValue >& info) - throw(SQLException, RuntimeException, DeploymentException, std::exception) { // open file @@ -202,7 +201,7 @@ void OCalcConnection::disposing() IMPLEMENT_SERVICE_INFO(OCalcConnection, "com.sun.star.sdbc.drivers.calc.Connection", "com.sun.star.sdbc.Connection") -Reference< XDatabaseMetaData > SAL_CALL OCalcConnection::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XDatabaseMetaData > SAL_CALL OCalcConnection::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -233,7 +232,7 @@ css::uno::Reference< XTablesSupplier > OCalcConnection::createCatalog() } -Reference< XStatement > SAL_CALL OCalcConnection::createStatement( ) throw(SQLException, RuntimeException, std::exception) +Reference< XStatement > SAL_CALL OCalcConnection::createStatement( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -246,7 +245,6 @@ Reference< XStatement > SAL_CALL OCalcConnection::createStatement( ) throw(SQLE Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareStatement( const OUString& sql ) - throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -261,7 +259,6 @@ Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareStatement( cons Reference< XPreparedStatement > SAL_CALL OCalcConnection::prepareCall( const OUString& /*sql*/ ) - throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx index 47986d4119a4..795c72103152 100644 --- a/connectivity/source/drivers/calc/CDatabaseMetaData.cxx +++ b/connectivity/source/drivers/calc/CDatabaseMetaData.cxx @@ -138,7 +138,7 @@ Reference< XResultSet > OCalcDatabaseMetaData::impl_getTypeInfo_throw( ) Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern, - const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception) + const OUString& columnNamePattern ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -232,7 +232,7 @@ Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getColumns( } -OUString SAL_CALL OCalcDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OCalcDatabaseMetaData::getURL( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -240,28 +240,28 @@ OUString SAL_CALL OCalcDatabaseMetaData::getURL( ) throw(SQLException, RuntimeE } -sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxBinaryLiteralLength( ) { return SAL_MAX_INT32; } -sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxCharLiteralLength( ) { return SAL_MAX_INT32; } -sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnNameLength( ) { return SAL_MAX_INT32; } -sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnsInIndex( ) { return 1; } -sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OCalcDatabaseMetaData::getMaxColumnsInTable( ) { return 256; } @@ -341,7 +341,6 @@ static bool lcl_IsUnnamed( const Reference& xRanges, const OUSt Reference< XResultSet > SAL_CALL OCalcDatabaseMetaData::getTables( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern, const Sequence< OUString >& types ) - throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/connectivity/source/drivers/calc/CDriver.cxx b/connectivity/source/drivers/calc/CDriver.cxx index 2e207f841089..4ac9899e5042 100644 --- a/connectivity/source/drivers/calc/CDriver.cxx +++ b/connectivity/source/drivers/calc/CDriver.cxx @@ -36,12 +36,12 @@ using namespace ::com::sun::star::lang; // static ServiceInfo -OUString ODriver::getImplementationName_Static( ) throw(RuntimeException) +OUString ODriver::getImplementationName_Static( ) { return OUString("com.sun.star.comp.sdbc.calc.ODriver"); } -OUString SAL_CALL ODriver::getImplementationName( ) throw(RuntimeException, std::exception) +OUString SAL_CALL ODriver::getImplementationName( ) { return getImplementationName_Static(); } @@ -51,13 +51,13 @@ OUString SAL_CALL ODriver::getImplementationName( ) throw(RuntimeException, std css::uno::Reference< css::uno::XInterface > SAL_CALL connectivity::calc::ODriver_CreateInstance(const css::uno::Reference< - css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception ) + css::lang::XMultiServiceFactory >& _rxFactory) { return *(new ODriver( comphelper::getComponentContext(_rxFactory) )); } Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, - const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException, std::exception) + const Sequence< PropertyValue >& info ) { ::osl::MutexGuard aGuard( m_aMutex ); if (ODriver_BASE::rBHelper.bDisposed) @@ -75,12 +75,11 @@ Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, } sal_Bool SAL_CALL ODriver::acceptsURL( const OUString& url ) - throw(SQLException, RuntimeException, std::exception) { return url.startsWith("sdbc:calc:"); } -Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException, std::exception) +Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) { if ( !acceptsURL(url) ) { diff --git a/connectivity/source/drivers/calc/CResultSet.cxx b/connectivity/source/drivers/calc/CResultSet.cxx index dc175865151e..b13f14a037f0 100644 --- a/connectivity/source/drivers/calc/CResultSet.cxx +++ b/connectivity/source/drivers/calc/CResultSet.cxx @@ -43,12 +43,12 @@ OCalcResultSet::OCalcResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTr registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISBOOKMARKABLE), PROPERTY_ID_ISBOOKMARKABLE, PropertyAttribute::READONLY,&m_bBookmarkable, cppu::UnoType::get()); } -OUString SAL_CALL OCalcResultSet::getImplementationName( ) throw ( RuntimeException, std::exception) +OUString SAL_CALL OCalcResultSet::getImplementationName( ) { return OUString("com.sun.star.sdbcx.calc.ResultSet"); } -Sequence< OUString > SAL_CALL OCalcResultSet::getSupportedServiceNames( ) throw( RuntimeException, std::exception) +Sequence< OUString > SAL_CALL OCalcResultSet::getSupportedServiceNames( ) { Sequence< OUString > aSupported(2); aSupported[0] = "com.sun.star.sdbc.ResultSet"; @@ -56,25 +56,25 @@ Sequence< OUString > SAL_CALL OCalcResultSet::getSupportedServiceNames( ) throw return aSupported; } -sal_Bool SAL_CALL OCalcResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException, std::exception) +sal_Bool SAL_CALL OCalcResultSet::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } -Any SAL_CALL OCalcResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OCalcResultSet::queryInterface( const Type & rType ) { Any aRet = OResultSet::queryInterface(rType); return aRet.hasValue() ? aRet : OCalcResultSet_BASE::queryInterface(rType); } - Sequence< Type > SAL_CALL OCalcResultSet::getTypes( ) throw( RuntimeException, std::exception) + Sequence< Type > SAL_CALL OCalcResultSet::getTypes( ) { return ::comphelper::concatSequences(OResultSet::getTypes(),OCalcResultSet_BASE::getTypes()); } // XRowLocate -Any SAL_CALL OCalcResultSet::getBookmark( ) throw( SQLException, RuntimeException, std::exception) +Any SAL_CALL OCalcResultSet::getBookmark( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -83,7 +83,7 @@ Any SAL_CALL OCalcResultSet::getBookmark( ) throw( SQLException, RuntimeExcept return makeAny((sal_Int32)(m_aRow->get())[0]->getValue()); } -sal_Bool SAL_CALL OCalcResultSet::moveToBookmark( const Any& bookmark ) throw( SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OCalcResultSet::moveToBookmark( const Any& bookmark ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -94,7 +94,7 @@ sal_Bool SAL_CALL OCalcResultSet::moveToBookmark( const Any& bookmark ) throw( return Move(IResultSetHelper::BOOKMARK,comphelper::getINT32(bookmark),true); } -sal_Bool SAL_CALL OCalcResultSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw( SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OCalcResultSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -108,17 +108,17 @@ sal_Bool SAL_CALL OCalcResultSet::moveRelativeToBookmark( const Any& bookmark, } -sal_Int32 SAL_CALL OCalcResultSet::compareBookmarks( const Any& lhs, const Any& rhs ) throw( SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OCalcResultSet::compareBookmarks( const Any& lhs, const Any& rhs ) { return (lhs == rhs) ? CompareBookmark::EQUAL : CompareBookmark::NOT_EQUAL; } -sal_Bool SAL_CALL OCalcResultSet::hasOrderedBookmarks( ) throw( SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OCalcResultSet::hasOrderedBookmarks( ) { return true; } -sal_Int32 SAL_CALL OCalcResultSet::hashBookmark( const Any& bookmark ) throw( SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OCalcResultSet::hashBookmark( const Any& bookmark ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -128,7 +128,7 @@ sal_Int32 SAL_CALL OCalcResultSet::hashBookmark( const Any& bookmark ) throw( S } // XDeleteRows -Sequence< sal_Int32 > SAL_CALL OCalcResultSet::deleteRows( const Sequence< Any >& /*rows*/ ) throw( SQLException, RuntimeException, std::exception) +Sequence< sal_Int32 > SAL_CALL OCalcResultSet::deleteRows( const Sequence< Any >& /*rows*/ ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -166,7 +166,7 @@ void SAL_CALL OCalcResultSet::release() throw() OCalcResultSet_BASE2::release(); } -css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OCalcResultSet::getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OCalcResultSet::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/calc/CTable.cxx b/connectivity/source/drivers/calc/CTable.cxx index cae94275f944..97cf3fa98fcf 100644 --- a/connectivity/source/drivers/calc/CTable.cxx +++ b/connectivity/source/drivers/calc/CTable.cxx @@ -642,7 +642,7 @@ void SAL_CALL OCalcTable::disposing() } -Sequence< Type > SAL_CALL OCalcTable::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL OCalcTable::getTypes( ) { Sequence< Type > aTypes = OTable_TYPEDEF::getTypes(); ::std::vector aOwnTypes; @@ -665,7 +665,7 @@ Sequence< Type > SAL_CALL OCalcTable::getTypes( ) throw(RuntimeException, std:: } -Any SAL_CALL OCalcTable::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OCalcTable::queryInterface( const Type & rType ) { if( rType == cppu::UnoType::get()|| rType == cppu::UnoType::get()|| @@ -696,7 +696,7 @@ Sequence< sal_Int8 > OCalcTable::getUnoTunnelImplementationId() // css::lang::XUnoTunnel -sal_Int64 OCalcTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception) +sal_Int64 OCalcTable::getSomething( const Sequence< sal_Int8 > & rId ) { return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) ? reinterpret_cast< sal_Int64 >( this ) diff --git a/connectivity/source/drivers/dbase/DColumns.cxx b/connectivity/source/drivers/dbase/DColumns.cxx index 126514003ba3..c4730d75b6a8 100644 --- a/connectivity/source/drivers/dbase/DColumns.cxx +++ b/connectivity/source/drivers/dbase/DColumns.cxx @@ -46,7 +46,7 @@ sdbcx::ObjectType ODbaseColumns::createObject(const OUString& _rName) } -void ODbaseColumns::impl_refresh() throw(RuntimeException) +void ODbaseColumns::impl_refresh() { m_pTable->refreshColumns(); } diff --git a/connectivity/source/drivers/dbase/DConnection.cxx b/connectivity/source/drivers/dbase/DConnection.cxx index 5c5c0d232fd9..0a56d952e49b 100644 --- a/connectivity/source/drivers/dbase/DConnection.cxx +++ b/connectivity/source/drivers/dbase/DConnection.cxx @@ -53,7 +53,7 @@ ODbaseConnection::~ODbaseConnection() IMPLEMENT_SERVICE_INFO(ODbaseConnection, "com.sun.star.sdbc.drivers.dbase.Connection", "com.sun.star.sdbc.Connection") -Reference< XDatabaseMetaData > SAL_CALL ODbaseConnection::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XDatabaseMetaData > SAL_CALL ODbaseConnection::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -82,7 +82,7 @@ css::uno::Reference< XTablesSupplier > ODbaseConnection::createCatalog() return xTab; } -Reference< XStatement > SAL_CALL ODbaseConnection::createStatement( ) throw(SQLException, RuntimeException, std::exception) +Reference< XStatement > SAL_CALL ODbaseConnection::createStatement( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -93,7 +93,7 @@ Reference< XStatement > SAL_CALL ODbaseConnection::createStatement( ) throw(SQL return xReturn; } -Reference< XPreparedStatement > SAL_CALL ODbaseConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +Reference< XPreparedStatement > SAL_CALL ODbaseConnection::prepareStatement( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -106,7 +106,7 @@ Reference< XPreparedStatement > SAL_CALL ODbaseConnection::prepareStatement( con return pStmt; } -Reference< XPreparedStatement > SAL_CALL ODbaseConnection::prepareCall( const OUString& /*sql*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XPreparedStatement > SAL_CALL ODbaseConnection::prepareCall( const OUString& /*sql*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::prepareCall", *this ); return nullptr; diff --git a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx index 1293e9fa71fd..758f5a9d097a 100644 --- a/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx +++ b/connectivity/source/drivers/dbase/DDatabaseMetaData.cxx @@ -154,7 +154,7 @@ Reference< XResultSet > ODbaseDatabaseMetaData::impl_getTypeInfo_throw( ) Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getColumns( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern, - const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception) + const OUString& columnNamePattern ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -254,7 +254,7 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getColumns( Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getIndexInfo( const Any& /*catalog*/, const OUString& /*schema*/, const OUString& table, - sal_Bool unique, sal_Bool /*approximate*/ ) throw(SQLException, RuntimeException, std::exception) + sal_Bool unique, sal_Bool /*approximate*/ ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -328,48 +328,48 @@ Reference< XResultSet > SAL_CALL ODbaseDatabaseMetaData::getIndexInfo( return xRef; } -OUString SAL_CALL ODbaseDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODbaseDatabaseMetaData::getURL( ) { ::osl::MutexGuard aGuard( m_aMutex ); return "sdbc:dbase:" + m_pConnection->getURL(); } -sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxBinaryLiteralLength( ) { return SAL_MAX_INT32; } -sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxCharLiteralLength( ) { return 254; } -sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxColumnNameLength( ) { return 10; } -sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxColumnsInIndex( ) { return 1; } -sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODbaseDatabaseMetaData::getMaxColumnsInTable( ) { return 128; } -sal_Bool SAL_CALL ODbaseDatabaseMetaData::supportsAlterTableWithAddColumn( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODbaseDatabaseMetaData::supportsAlterTableWithAddColumn( ) { return true; } -sal_Bool SAL_CALL ODbaseDatabaseMetaData::supportsAlterTableWithDropColumn( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODbaseDatabaseMetaData::supportsAlterTableWithDropColumn( ) { return false; } -sal_Bool SAL_CALL ODbaseDatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODbaseDatabaseMetaData::isReadOnly( ) { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/connectivity/source/drivers/dbase/DDriver.cxx b/connectivity/source/drivers/dbase/DDriver.cxx index cf0967fcc303..21ecbe05ac8c 100644 --- a/connectivity/source/drivers/dbase/DDriver.cxx +++ b/connectivity/source/drivers/dbase/DDriver.cxx @@ -35,24 +35,24 @@ using namespace ::com::sun::star::lang; // static ServiceInfo -OUString ODriver::getImplementationName_Static( ) throw(RuntimeException) +OUString ODriver::getImplementationName_Static( ) { return OUString("com.sun.star.comp.sdbc.dbase.ODriver"); } -OUString SAL_CALL ODriver::getImplementationName( ) throw(RuntimeException, std::exception) +OUString SAL_CALL ODriver::getImplementationName( ) { return getImplementationName_Static(); } -css::uno::Reference< css::uno::XInterface > SAL_CALL connectivity::dbase::ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception ) +css::uno::Reference< css::uno::XInterface > SAL_CALL connectivity::dbase::ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) { return *(new ODriver( comphelper::getComponentContext(_rxFactory) )); } -Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) { ::osl::MutexGuard aGuard( m_aMutex ); if (ODriver_BASE::rBHelper.bDisposed) @@ -69,12 +69,12 @@ Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const S return xCon; } -sal_Bool SAL_CALL ODriver::acceptsURL( const OUString& url ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODriver::acceptsURL( const OUString& url ) { return url.startsWith("sdbc:dbase:"); } -Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException, std::exception) +Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) { if ( acceptsURL(url) ) { diff --git a/connectivity/source/drivers/dbase/DIndex.cxx b/connectivity/source/drivers/dbase/DIndex.cxx index 416ad8d6653f..283700649dea 100644 --- a/connectivity/source/drivers/dbase/DIndex.cxx +++ b/connectivity/source/drivers/dbase/DIndex.cxx @@ -123,7 +123,7 @@ Sequence< sal_Int8 > ODbaseIndex::getUnoTunnelImplementationId() // XUnoTunnel -sal_Int64 ODbaseIndex::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception) +sal_Int64 ODbaseIndex::getSomething( const Sequence< sal_Int8 > & rId ) { return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) ? reinterpret_cast< sal_Int64 >( this ) diff --git a/connectivity/source/drivers/dbase/DIndexColumns.cxx b/connectivity/source/drivers/dbase/DIndexColumns.cxx index 951c0982f41b..9a586b162edd 100644 --- a/connectivity/source/drivers/dbase/DIndexColumns.cxx +++ b/connectivity/source/drivers/dbase/DIndexColumns.cxx @@ -65,7 +65,7 @@ sdbcx::ObjectType ODbaseIndexColumns::createObject(const OUString& _rName) } -void ODbaseIndexColumns::impl_refresh() throw(RuntimeException) +void ODbaseIndexColumns::impl_refresh() { m_pIndex->refreshColumns(); } diff --git a/connectivity/source/drivers/dbase/DIndexes.cxx b/connectivity/source/drivers/dbase/DIndexes.cxx index 34e98ec25e9b..f1a722615335 100644 --- a/connectivity/source/drivers/dbase/DIndexes.cxx +++ b/connectivity/source/drivers/dbase/DIndexes.cxx @@ -78,7 +78,7 @@ sdbcx::ObjectType ODbaseIndexes::createObject(const OUString& _rName) return xRet; } -void ODbaseIndexes::impl_refresh( ) throw(RuntimeException) +void ODbaseIndexes::impl_refresh( ) { if(m_pTable) m_pTable->refreshIndexes(); diff --git a/connectivity/source/drivers/dbase/DResultSet.cxx b/connectivity/source/drivers/dbase/DResultSet.cxx index a93fde690981..cc133550114f 100644 --- a/connectivity/source/drivers/dbase/DResultSet.cxx +++ b/connectivity/source/drivers/dbase/DResultSet.cxx @@ -46,12 +46,12 @@ ODbaseResultSet::ODbaseResultSet( OStatement_Base* pStmt,connectivity::OSQLParse registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISBOOKMARKABLE), PROPERTY_ID_ISBOOKMARKABLE, PropertyAttribute::READONLY,&m_bBookmarkable, cppu::UnoType::get()); } -OUString SAL_CALL ODbaseResultSet::getImplementationName( ) throw ( RuntimeException, std::exception) +OUString SAL_CALL ODbaseResultSet::getImplementationName( ) { return OUString("com.sun.star.sdbcx.dbase.ResultSet"); } -Sequence< OUString > SAL_CALL ODbaseResultSet::getSupportedServiceNames( ) throw( RuntimeException, std::exception) +Sequence< OUString > SAL_CALL ODbaseResultSet::getSupportedServiceNames( ) { Sequence< OUString > aSupported(2); aSupported[0] = "com.sun.star.sdbc.ResultSet"; @@ -59,25 +59,25 @@ Sequence< OUString > SAL_CALL ODbaseResultSet::getSupportedServiceNames( ) thro return aSupported; } -sal_Bool SAL_CALL ODbaseResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException, std::exception) +sal_Bool SAL_CALL ODbaseResultSet::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } -Any SAL_CALL ODbaseResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL ODbaseResultSet::queryInterface( const Type & rType ) { Any aRet = ODbaseResultSet_BASE::queryInterface(rType); return aRet.hasValue() ? aRet : OResultSet::queryInterface(rType); } - Sequence< Type > SAL_CALL ODbaseResultSet::getTypes( ) throw( RuntimeException, std::exception) + Sequence< Type > SAL_CALL ODbaseResultSet::getTypes( ) { return ::comphelper::concatSequences(OResultSet::getTypes(),ODbaseResultSet_BASE::getTypes()); } // XRowLocate -Any SAL_CALL ODbaseResultSet::getBookmark( ) throw( SQLException, RuntimeException, std::exception) +Any SAL_CALL ODbaseResultSet::getBookmark( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -86,7 +86,7 @@ Any SAL_CALL ODbaseResultSet::getBookmark( ) throw( SQLException, RuntimeExcep return makeAny((sal_Int32)(m_aRow->get())[0]->getValue()); } -sal_Bool SAL_CALL ODbaseResultSet::moveToBookmark( const Any& bookmark ) throw( SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODbaseResultSet::moveToBookmark( const Any& bookmark ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -97,7 +97,7 @@ sal_Bool SAL_CALL ODbaseResultSet::moveToBookmark( const Any& bookmark ) throw( return m_pTable.is() && Move(IResultSetHelper::BOOKMARK,comphelper::getINT32(bookmark),true); } -sal_Bool SAL_CALL ODbaseResultSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw( SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODbaseResultSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -111,7 +111,7 @@ sal_Bool SAL_CALL ODbaseResultSet::moveRelativeToBookmark( const Any& bookmark, } -sal_Int32 SAL_CALL ODbaseResultSet::compareBookmarks( const Any& lhs, const Any& rhs ) throw( SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODbaseResultSet::compareBookmarks( const Any& lhs, const Any& rhs ) { sal_Int32 nFirst(0),nSecond(0),nResult(0); if ( !( lhs >>= nFirst ) || !( rhs >>= nSecond ) ) @@ -131,12 +131,12 @@ sal_Int32 SAL_CALL ODbaseResultSet::compareBookmarks( const Any& lhs, const Any& return nResult; } -sal_Bool SAL_CALL ODbaseResultSet::hasOrderedBookmarks( ) throw( SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODbaseResultSet::hasOrderedBookmarks( ) { return true; } -sal_Int32 SAL_CALL ODbaseResultSet::hashBookmark( const Any& bookmark ) throw( SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODbaseResultSet::hashBookmark( const Any& bookmark ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -146,7 +146,7 @@ sal_Int32 SAL_CALL ODbaseResultSet::hashBookmark( const Any& bookmark ) throw( } // XDeleteRows -Sequence< sal_Int32 > SAL_CALL ODbaseResultSet::deleteRows( const Sequence< Any >& /*rows*/ ) throw( SQLException, RuntimeException, std::exception) +Sequence< sal_Int32 > SAL_CALL ODbaseResultSet::deleteRows( const Sequence< Any >& /*rows*/ ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -207,7 +207,7 @@ void SAL_CALL ODbaseResultSet::release() throw() ODbaseResultSet_BASE2::release(); } -css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL ODbaseResultSet::getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL ODbaseResultSet::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/dbase/DTable.cxx b/connectivity/source/drivers/dbase/DTable.cxx index 0229fae7ee46..0408c7929f81 100644 --- a/connectivity/source/drivers/dbase/DTable.cxx +++ b/connectivity/source/drivers/dbase/DTable.cxx @@ -727,7 +727,7 @@ void SAL_CALL ODbaseTable::disposing() m_aColumns = nullptr; } -Sequence< Type > SAL_CALL ODbaseTable::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL ODbaseTable::getTypes( ) { Sequence< Type > aTypes = OTable_TYPEDEF::getTypes(); ::std::vector aOwnTypes; @@ -748,7 +748,7 @@ Sequence< Type > SAL_CALL ODbaseTable::getTypes( ) throw(RuntimeException, std: } -Any SAL_CALL ODbaseTable::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL ODbaseTable::queryInterface( const Type & rType ) { if( rType == cppu::UnoType::get()|| rType == cppu::UnoType::get()) @@ -776,7 +776,7 @@ Sequence< sal_Int8 > ODbaseTable::getUnoTunnelImplementationId() // css::lang::XUnoTunnel -sal_Int64 ODbaseTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception) +sal_Int64 ODbaseTable::getSomething( const Sequence< sal_Int8 > & rId ) { return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) ? reinterpret_cast< sal_Int64 >( this ) @@ -2146,7 +2146,7 @@ bool ODbaseTable::WriteMemo(const ORowSetValue& aVariable, std::size_t& rBlockNr // XAlterTable -void SAL_CALL ODbaseTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException, std::exception) +void SAL_CALL ODbaseTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed); @@ -2165,7 +2165,7 @@ void SAL_CALL ODbaseTable::alterColumnByName( const OUString& colName, const Ref } } -void SAL_CALL ODbaseTable::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor ) throw(SQLException, css::lang::IndexOutOfBoundsException, RuntimeException, std::exception) +void SAL_CALL ODbaseTable::alterColumnByIndex( sal_Int32 index, const Reference< XPropertySet >& descriptor ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed); @@ -2301,7 +2301,7 @@ Reference< XDatabaseMetaData> ODbaseTable::getMetaData() const return getConnection()->getMetaData(); } -void SAL_CALL ODbaseTable::rename( const OUString& newName ) throw(css::sdbc::SQLException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) +void SAL_CALL ODbaseTable::rename( const OUString& newName ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed); @@ -2357,7 +2357,7 @@ namespace } } -void SAL_CALL ODbaseTable::renameImpl( const OUString& newName ) throw(css::sdbc::SQLException, css::container::ElementExistException, css::uno::RuntimeException, std::exception) +void SAL_CALL ODbaseTable::renameImpl( const OUString& newName ) { ::osl::MutexGuard aGuard(m_aMutex); diff --git a/connectivity/source/drivers/dbase/DTables.cxx b/connectivity/source/drivers/dbase/DTables.cxx index 04211f521b5d..a2a5add764e3 100644 --- a/connectivity/source/drivers/dbase/DTables.cxx +++ b/connectivity/source/drivers/dbase/DTables.cxx @@ -56,7 +56,7 @@ sdbcx::ObjectType ODbaseTables::createObject(const OUString& _rName) return xRet; } -void ODbaseTables::impl_refresh( ) throw(RuntimeException) +void ODbaseTables::impl_refresh( ) { static_cast(&m_rParent)->refreshTables(); } @@ -124,7 +124,7 @@ void ODbaseTables::dropObject(sal_Int32 _nPos, const OUString& _sElementName) } } -Any SAL_CALL ODbaseTables::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL ODbaseTables::queryInterface( const Type & rType ) { typedef sdbcx::OCollection OTables_BASE; return OTables_BASE::queryInterface(rType); diff --git a/connectivity/source/drivers/evoab2/NCatalog.cxx b/connectivity/source/drivers/evoab2/NCatalog.cxx index acc455a96e41..b0f9945b116d 100644 --- a/connectivity/source/drivers/evoab2/NCatalog.cxx +++ b/connectivity/source/drivers/evoab2/NCatalog.cxx @@ -61,7 +61,7 @@ void OEvoabCatalog::refreshTables() m_pTables = new OEvoabTables(m_xMetaData,*this,m_aMutex,aVector); } // XTablesSupplier -Reference< XNameAccess > SAL_CALL OEvoabCatalog::getTables( ) throw(RuntimeException, std::exception) +Reference< XNameAccess > SAL_CALL OEvoabCatalog::getTables( ) { ::osl::MutexGuard aGuard(m_aMutex); diff --git a/connectivity/source/drivers/evoab2/NCatalog.hxx b/connectivity/source/drivers/evoab2/NCatalog.hxx index 05afef5554d7..617a0cfe64f3 100644 --- a/connectivity/source/drivers/evoab2/NCatalog.hxx +++ b/connectivity/source/drivers/evoab2/NCatalog.hxx @@ -39,7 +39,7 @@ namespace connectivity virtual void refreshUsers() override {} // XTablesSupplier virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables( - ) throw(css::uno::RuntimeException, std::exception) override; + ) override; }; } } diff --git a/connectivity/source/drivers/evoab2/NColumns.cxx b/connectivity/source/drivers/evoab2/NColumns.cxx index 812911e4e40e..46c42c69b137 100644 --- a/connectivity/source/drivers/evoab2/NColumns.cxx +++ b/connectivity/source/drivers/evoab2/NColumns.cxx @@ -81,7 +81,7 @@ sdbcx::ObjectType OEvoabColumns::createObject(const OUString& _rName) return xRet; } -void OEvoabColumns::impl_refresh() throw(RuntimeException) +void OEvoabColumns::impl_refresh() { m_pTable->refreshColumns(); } diff --git a/connectivity/source/drivers/evoab2/NColumns.hxx b/connectivity/source/drivers/evoab2/NColumns.hxx index d405efb83b10..e7e2065a5ac5 100644 --- a/connectivity/source/drivers/evoab2/NColumns.hxx +++ b/connectivity/source/drivers/evoab2/NColumns.hxx @@ -33,7 +33,7 @@ namespace connectivity OEvoabTable* m_pTable; virtual sdbcx::ObjectType createObject(const OUString& _rName) override; - virtual void impl_refresh() throw(css::uno::RuntimeException) override; + virtual void impl_refresh() override; public: OEvoabColumns( OEvoabTable* _pTable, diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx index a9975170727c..fa6fd275e5b6 100644 --- a/connectivity/source/drivers/evoab2/NConnection.cxx +++ b/connectivity/source/drivers/evoab2/NConnection.cxx @@ -69,7 +69,7 @@ void SAL_CALL OEvoabConnection::release() throw() IMPLEMENT_SERVICE_INFO(OEvoabConnection, "com.sun.star.sdbc.drivers.evoab.Connection", "com.sun.star.sdbc.Connection") -void OEvoabConnection::construct(const OUString& url, const Sequence< PropertyValue >& info) throw(SQLException) +void OEvoabConnection::construct(const OUString& url, const Sequence< PropertyValue >& info) { osl_atomic_increment( &m_refCount ); SAL_INFO("connectivity.evoab2", "OEvoabConnection::construct()::url = " << url ); @@ -100,13 +100,13 @@ void OEvoabConnection::construct(const OUString& url, const Sequence< PropertyVa } -OUString SAL_CALL OEvoabConnection::nativeSQL( const OUString& _sSql ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabConnection::nativeSQL( const OUString& _sSql ) { // when you need to transform SQL92 to you driver specific you can do it here return _sSql; } -Reference< XDatabaseMetaData > SAL_CALL OEvoabConnection::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XDatabaseMetaData > SAL_CALL OEvoabConnection::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -134,7 +134,7 @@ css::uno::Reference< XTablesSupplier > OEvoabConnection::createCatalog() return xTab; } -Reference< XStatement > SAL_CALL OEvoabConnection::createStatement( ) throw(SQLException, RuntimeException, std::exception) +Reference< XStatement > SAL_CALL OEvoabConnection::createStatement( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -146,7 +146,7 @@ Reference< XStatement > SAL_CALL OEvoabConnection::createStatement( ) throw(SQL return xStmt; } -Reference< XPreparedStatement > SAL_CALL OEvoabConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +Reference< XPreparedStatement > SAL_CALL OEvoabConnection::prepareStatement( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -159,12 +159,12 @@ Reference< XPreparedStatement > SAL_CALL OEvoabConnection::prepareStatement( con return xStmt; } -Reference< XPreparedStatement > SAL_CALL OEvoabConnection::prepareCall( const OUString& /*sql*/ ) throw( SQLException, RuntimeException, std::exception) +Reference< XPreparedStatement > SAL_CALL OEvoabConnection::prepareCall( const OUString& /*sql*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::prepareCall", *this ); return nullptr; } -sal_Bool SAL_CALL OEvoabConnection::isClosed( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabConnection::isClosed( ) { ::osl::MutexGuard aGuard( m_aMutex ); return OConnection_BASE::rBHelper.bDisposed; @@ -172,7 +172,7 @@ sal_Bool SAL_CALL OEvoabConnection::isClosed( ) throw(SQLException, RuntimeExce // XCloseable -void SAL_CALL OEvoabConnection::close( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabConnection::close( ) { { // we just dispose us ::osl::MutexGuard aGuard( m_aMutex ); @@ -183,11 +183,11 @@ void SAL_CALL OEvoabConnection::close( ) throw(SQLException, RuntimeException, // XWarningsSupplier -Any SAL_CALL OEvoabConnection::getWarnings( ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OEvoabConnection::getWarnings( ) { return m_aWarnings.getWarnings(); } -void SAL_CALL OEvoabConnection::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabConnection::clearWarnings( ) { m_aWarnings.clearWarnings(); } @@ -202,53 +202,53 @@ void OEvoabConnection::disposing() } // -------------------------------- stubbed methods ------------------------------------------------ -void SAL_CALL OEvoabConnection::setAutoCommit( sal_Bool /*autoCommit*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabConnection::setAutoCommit( sal_Bool /*autoCommit*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setAutoCommit", *this ); } -sal_Bool SAL_CALL OEvoabConnection::getAutoCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabConnection::getAutoCommit( ) { return true; } -void SAL_CALL OEvoabConnection::commit( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabConnection::commit( ) { } -void SAL_CALL OEvoabConnection::rollback( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabConnection::rollback( ) { } -void SAL_CALL OEvoabConnection::setReadOnly( sal_Bool /*readOnly*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabConnection::setReadOnly( sal_Bool /*readOnly*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setReadOnly", *this ); } -sal_Bool SAL_CALL OEvoabConnection::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabConnection::isReadOnly( ) { return false; } -void SAL_CALL OEvoabConnection::setCatalog( const OUString& /*catalog*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabConnection::setCatalog( const OUString& /*catalog*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setCatalog", *this ); } -OUString SAL_CALL OEvoabConnection::getCatalog( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabConnection::getCatalog( ) { return OUString(); } -void SAL_CALL OEvoabConnection::setTransactionIsolation( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabConnection::setTransactionIsolation( sal_Int32 /*level*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setTransactionIsolation", *this ); } -sal_Int32 SAL_CALL OEvoabConnection::getTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabConnection::getTransactionIsolation( ) { return TransactionIsolation::NONE; } -Reference< css::container::XNameAccess > SAL_CALL OEvoabConnection::getTypeMap( ) throw(SQLException, RuntimeException, std::exception) +Reference< css::container::XNameAccess > SAL_CALL OEvoabConnection::getTypeMap( ) { ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::getTypeMap", *this ); return nullptr; } -void SAL_CALL OEvoabConnection::setTypeMap( const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabConnection::setTypeMap( const Reference< css::container::XNameAccess >& /*typeMap*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setTypeMap", *this ); } diff --git a/connectivity/source/drivers/evoab2/NConnection.hxx b/connectivity/source/drivers/evoab2/NConnection.hxx index bc1a39608f23..903d7255885a 100644 --- a/connectivity/source/drivers/evoab2/NConnection.hxx +++ b/connectivity/source/drivers/evoab2/NConnection.hxx @@ -66,7 +66,7 @@ namespace connectivity public: explicit OEvoabConnection( OEvoabDriver& _rDriver ); /// @throws css::sdbc::SQLException - virtual void construct(const OUString& _rUrl,const css::uno::Sequence< css::beans::PropertyValue >& _rInfo ) throw( css::sdbc::SQLException); + virtual void construct(const OUString& _rUrl,const css::uno::Sequence< css::beans::PropertyValue >& _rInfo ); inline OString const & getPassword() { return m_aPassword; } inline void setPassword( OString const & aStr ) { m_aPassword = aStr; } @@ -86,30 +86,30 @@ namespace connectivity // XConnection virtual css::uno::Reference< css::sdbcx::XTablesSupplier > createCatalog(); - virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getAutoCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL commit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL rollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isClosed( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCatalog( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) override; + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) override; + virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) override; + virtual sal_Bool SAL_CALL getAutoCommit( ) override; + virtual void SAL_CALL commit( ) override; + virtual void SAL_CALL rollback( ) override; + virtual sal_Bool SAL_CALL isClosed( ) override; + virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) override; + virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) override; + virtual sal_Bool SAL_CALL isReadOnly( ) override; + virtual void SAL_CALL setCatalog( const OUString& catalog ) override; + virtual OUString SAL_CALL getCatalog( ) override; + virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) override; + virtual sal_Int32 SAL_CALL getTransactionIsolation( ) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) override; + virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; // XCloseable - virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) override; // XWarningsSupplier - virtual css::uno::Any SAL_CALL getWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getWarnings( ) override; + virtual void SAL_CALL clearWarnings( ) override; }; } } diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx index 11fa505f6ee5..440a62b24d4f 100644 --- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx +++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx @@ -322,47 +322,47 @@ OUString OEvoabDatabaseMetaData::impl_getCatalogSeparator_throw( ) return OUString(); } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxBinaryLiteralLength( ) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxRowSize( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxRowSize( ) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxCatalogNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxCatalogNameLength( ) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxCharLiteralLength( ) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnNameLength( ) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInIndex( ) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxCursorNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxCursorNameLength( ) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxConnections( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxConnections( ) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInTable( ) { return 0;// 0 means no limit } @@ -372,7 +372,7 @@ sal_Int32 OEvoabDatabaseMetaData::impl_getMaxStatements_throw( ) return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxTableNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxTableNameLength( ) { return 0;// 0 means no limit } @@ -384,17 +384,17 @@ sal_Int32 OEvoabDatabaseMetaData::impl_getMaxTablesInSelect_throw( ) } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesLowerCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesLowerCaseIdentifiers( ) { return false; } @@ -404,17 +404,17 @@ bool OEvoabDatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesMixedCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesMixedCaseIdentifiers( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesUpperCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesUpperCaseIdentifiers( ) { return false; } @@ -429,17 +429,17 @@ bool OEvoabDatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw( ) return false; } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxIndexLength( ) { return 0;// 0 means no limit } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsNonNullableColumns( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsNonNullableColumns( ) { return false; } -OUString SAL_CALL OEvoabDatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabDatabaseMetaData::getCatalogTerm( ) { OUString aVal; return aVal; @@ -452,13 +452,13 @@ OUString OEvoabDatabaseMetaData::impl_getIdentifierQuoteString_throw( ) return aVal; } -OUString SAL_CALL OEvoabDatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabDatabaseMetaData::getExtraNameCharacters( ) { OUString aVal; return aVal; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsDifferentTableCorrelationNames( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsDifferentTableCorrelationNames( ) { return false; } @@ -468,57 +468,57 @@ bool OEvoabDatabaseMetaData::impl_isCatalogAtStart_throw( ) return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::dataDefinitionIgnoredInTransactions( ) { return true; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::dataDefinitionCausesTransactionCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::dataDefinitionCausesTransactionCommit( ) { return true; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsDataManipulationTransactionsOnly( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsDataManipulationTransactionsOnly( ) { return true; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) { return true; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsPositionedDelete( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsPositionedDelete( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsPositionedUpdate( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsPositionedUpdate( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOpenStatementsAcrossRollback( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOpenStatementsAcrossRollback( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOpenStatementsAcrossCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOpenStatementsAcrossCommit( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOpenCursorsAcrossCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOpenCursorsAcrossCommit( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOpenCursorsAcrossRollback( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOpenCursorsAcrossRollback( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 /*level*/ ) { return false; } @@ -528,22 +528,22 @@ bool OEvoabDatabaseMetaData::impl_supportsSchemasInDataManipulation_throw( ) return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsANSI92FullSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsANSI92FullSQL( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsANSI92EntryLevelSQL( ) { return true; // should be supported at least } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsIntegrityEnhancementFacility( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSchemasInIndexDefinitions( ) { return false; } @@ -558,7 +558,7 @@ bool OEvoabDatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw( ) return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCatalogsInIndexDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCatalogsInIndexDefinitions( ) { return false; } @@ -568,145 +568,145 @@ bool OEvoabDatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw( ) return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOuterJoins( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOuterJoins( ) { return false; } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxStatementLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxStatementLength( ) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxProcedureNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxProcedureNameLength( ) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxSchemaNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxSchemaNameLength( ) { return 0;// 0 means no limit } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsTransactions( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::allProceduresAreCallable( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::allProceduresAreCallable( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsStoredProcedures( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsStoredProcedures( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSelectForUpdate( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSelectForUpdate( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::allTablesAreSelectable( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::allTablesAreSelectable( ) { // We allow you to select from any table. return true; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::isReadOnly( ) { // For now definitely read-only, no support for update/delete return true; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::usesLocalFiles( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::usesLocalFiles( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::usesLocalFilePerTable( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::usesLocalFilePerTable( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsTypeConversion( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsTypeConversion( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullPlusNonNullIsNull( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullPlusNonNullIsNull( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsColumnAliasing( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsColumnAliasing( ) { // todo add Support for this. return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsTableCorrelationNames( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsTableCorrelationNames( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, sal_Int32 /*toType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, sal_Int32 /*toType*/ ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsExpressionsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsExpressionsInOrderBy( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsGroupBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsGroupBy( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsGroupByBeyondSelect( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsGroupByBeyondSelect( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsGroupByUnrelated( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsGroupByUnrelated( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsMultipleTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsMultipleTransactions( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsMultipleResultSets( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsMultipleResultSets( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsLikeEscapeClause( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsOrderByUnrelated( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsUnion( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsUnion( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsUnionAll( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsUnionAll( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsMixedCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsMixedCaseIdentifiers( ) { return false; } @@ -717,271 +717,271 @@ bool OEvoabDatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw( ) return true; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullsAreSortedAtEnd( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullsAreSortedAtStart( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullsAreSortedAtStart( ) { return true; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullsAreSortedHigh( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullsAreSortedHigh( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullsAreSortedLow( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::nullsAreSortedLow( ) { return true; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSchemasInProcedureCalls( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSchemasInProcedureCalls( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCatalogsInProcedureCalls( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCorrelatedSubqueries( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCorrelatedSubqueries( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSubqueriesInComparisons( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSubqueriesInComparisons( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSubqueriesInExists( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSubqueriesInExists( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSubqueriesInIns( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSubqueriesInIns( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsSubqueriesInQuantifieds( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsANSI92IntermediateSQL( ) { return false; } -OUString SAL_CALL OEvoabDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabDatabaseMetaData::getURL( ) { ::osl::MutexGuard aGuard( m_aMutex ); return m_pConnection->getURL(); } -OUString SAL_CALL OEvoabDatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabDatabaseMetaData::getUserName( ) { OUString aValue; return aValue; } -OUString SAL_CALL OEvoabDatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabDatabaseMetaData::getDriverName( ) { OUString aValue; return aValue; } -OUString SAL_CALL OEvoabDatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabDatabaseMetaData::getDriverVersion() { return OUString( "1" ); } -OUString SAL_CALL OEvoabDatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabDatabaseMetaData::getDatabaseProductVersion( ) { return OUString( "0" ); } -OUString SAL_CALL OEvoabDatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabDatabaseMetaData::getDatabaseProductName( ) { OUString aValue; return aValue; } -OUString SAL_CALL OEvoabDatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabDatabaseMetaData::getProcedureTerm( ) { OUString aValue; return aValue; } -OUString SAL_CALL OEvoabDatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabDatabaseMetaData::getSchemaTerm( ) { OUString aValue; return aValue; } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getDriverMajorVersion( ) { return 1; } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getDefaultTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getDefaultTransactionIsolation( ) { return TransactionIsolation::NONE; } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getDriverMinorVersion( ) { return 0; } -OUString SAL_CALL OEvoabDatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabDatabaseMetaData::getSQLKeywords( ) { OUString aValue; return aValue; } -OUString SAL_CALL OEvoabDatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabDatabaseMetaData::getSearchStringEscape( ) { OUString aValue; return aValue; } -OUString SAL_CALL OEvoabDatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabDatabaseMetaData::getStringFunctions( ) { return OUString(); } -OUString SAL_CALL OEvoabDatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabDatabaseMetaData::getTimeDateFunctions( ) { return OUString(); } -OUString SAL_CALL OEvoabDatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabDatabaseMetaData::getSystemFunctions( ) { return OUString(); } -OUString SAL_CALL OEvoabDatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabDatabaseMetaData::getNumericFunctions( ) { return OUString(); } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsExtendedSQLGrammar( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCoreSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsCoreSQLGrammar( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsMinimumSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsMinimumSQLGrammar( ) { return true; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsFullOuterJoins( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsFullOuterJoins( ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsLimitedOuterJoins( ) { return false; } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInGroupBy( ) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInOrderBy( ) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxColumnsInSelect( ) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxUserNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxUserNameLength( ) { return 0;// 0 means no limit } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsResultSetType( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsResultSetType( sal_Int32 /*setType*/ ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsResultSetConcurrency( sal_Int32 /*setType*/, sal_Int32 /*concurrency*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsResultSetConcurrency( sal_Int32 /*setType*/, sal_Int32 /*concurrency*/ ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::ownUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::ownUpdatesAreVisible( sal_Int32 /*setType*/ ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::ownDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::ownDeletesAreVisible( sal_Int32 /*setType*/ ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::ownInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::ownInsertsAreVisible( sal_Int32 /*setType*/ ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::othersUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::othersUpdatesAreVisible( sal_Int32 /*setType*/ ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::othersDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::othersDeletesAreVisible( sal_Int32 /*setType*/ ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::othersInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::othersInsertsAreVisible( sal_Int32 /*setType*/ ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::updatesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::updatesAreDetected( sal_Int32 /*setType*/ ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::deletesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::deletesAreDetected( sal_Int32 /*setType*/ ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::insertsAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::insertsAreDetected( sal_Int32 /*setType*/ ) { return false; } -sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsBatchUpdates( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsBatchUpdates( ) { return false; } @@ -991,7 +991,7 @@ sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsBatchUpdates( ) throw(SQLExce // of course you could implement it on your and you should do this because // the general way is more memory expensive -Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTableTypes( ) { /* Don't need to change as evoab driver supports only table */ @@ -1069,7 +1069,7 @@ Reference< XResultSet > OEvoabDatabaseMetaData::impl_getTypeInfo_throw( ) Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getColumns( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*tableNamePattern*/, - const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception) + const OUString& columnNamePattern ) { // this returns an empty resultset where the column-names are already set // in special the metadata of the resultset already returns the right columns @@ -1091,7 +1091,7 @@ bool isSourceBackend(ESource *pSource, const char *backendname) Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables( const Any& /*catalog*/, const OUString& /*schemaPattern*/, - const OUString& /*tableNamePattern*/, const Sequence< OUString >& types ) throw(SQLException, RuntimeException, std::exception) + const OUString& /*tableNamePattern*/, const Sequence< OUString >& types ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1227,7 +1227,7 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables( return xRef; } -Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XDatabaseMetaDaza::getUDTs", *this ); return nullptr; diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx index 5d2d7645b3cb..39a9b2adaa54 100644 --- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx +++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx @@ -91,129 +91,129 @@ namespace connectivity // as I mentioned before this interface is really BIG // XDatabaseMetaData - virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getURL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getUserName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDatabaseProductName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDatabaseProductVersion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDriverName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDriverVersion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL usesLocalFiles( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - - virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - - virtual OUString SAL_CALL getSQLKeywords( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getNumericFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getStringFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSystemFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTimeDateFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSearchStringEscape( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getExtraNameCharacters( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTypeConversion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsGroupBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSchemaTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getProcedureTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCatalogTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsPositionedDelete( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsStoredProcedures( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsUnion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsUnionAll( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxConnections( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxIndexLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxRowSize( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxStatementLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL allProceduresAreCallable( ) override; + virtual sal_Bool SAL_CALL allTablesAreSelectable( ) override; + virtual OUString SAL_CALL getURL( ) override; + virtual OUString SAL_CALL getUserName( ) override; + virtual sal_Bool SAL_CALL isReadOnly( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedLow( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) override; + virtual OUString SAL_CALL getDatabaseProductName( ) override; + virtual OUString SAL_CALL getDatabaseProductVersion( ) override; + virtual OUString SAL_CALL getDriverName( ) override; + virtual OUString SAL_CALL getDriverVersion( ) override; + virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) override; + virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) override; + virtual sal_Bool SAL_CALL usesLocalFiles( ) override; + virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) override; + virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) override; + + virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) override; + + virtual OUString SAL_CALL getSQLKeywords( ) override; + virtual OUString SAL_CALL getNumericFunctions( ) override; + virtual OUString SAL_CALL getStringFunctions( ) override; + virtual OUString SAL_CALL getSystemFunctions( ) override; + virtual OUString SAL_CALL getTimeDateFunctions( ) override; + virtual OUString SAL_CALL getSearchStringEscape( ) override; + virtual OUString SAL_CALL getExtraNameCharacters( ) override; + virtual sal_Bool SAL_CALL supportsColumnAliasing( ) override; + virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) override; + virtual sal_Bool SAL_CALL supportsTypeConversion( ) override; + virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) override; + virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) override; + virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) override; + virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) override; + virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) override; + virtual sal_Bool SAL_CALL supportsGroupBy( ) override; + virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) override; + virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) override; + virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) override; + virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) override; + virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) override; + virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) override; + virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) override; + virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) override; + virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) override; + virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) override; + virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) override; + virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) override; + virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) override; + virtual sal_Bool SAL_CALL supportsOuterJoins( ) override; + virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) override; + virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) override; + virtual OUString SAL_CALL getSchemaTerm( ) override; + virtual OUString SAL_CALL getProcedureTerm( ) override; + virtual OUString SAL_CALL getCatalogTerm( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsPositionedDelete( ) override; + virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) override; + virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) override; + virtual sal_Bool SAL_CALL supportsStoredProcedures( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) override; + virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) override; + virtual sal_Bool SAL_CALL supportsUnion( ) override; + virtual sal_Bool SAL_CALL supportsUnionAll( ) override; + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) override; + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) override; + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) override; + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) override; + virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) override; + virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) override; + virtual sal_Int32 SAL_CALL getMaxConnections( ) override; + virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxIndexLength( ) override; + virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxRowSize( ) override; + virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) override; + virtual sal_Int32 SAL_CALL getMaxStatementLength( ) override; + virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) override; + virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) override; + virtual sal_Bool SAL_CALL supportsTransactions( ) override; + virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) override; + virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) override; + virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) override; + virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) override; + virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) override; + virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) override; + virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL supportsBatchUpdates( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) override; }; } } diff --git a/connectivity/source/drivers/evoab2/NDriver.cxx b/connectivity/source/drivers/evoab2/NDriver.cxx index d4a7baa033cd..bc98a3f18fb3 100644 --- a/connectivity/source/drivers/evoab2/NDriver.cxx +++ b/connectivity/source/drivers/evoab2/NDriver.cxx @@ -79,7 +79,7 @@ void OEvoabDriver::disposing() // static ServiceInfo -OUString OEvoabDriver::getImplementationName_Static( ) throw(RuntimeException) +OUString OEvoabDriver::getImplementationName_Static( ) { return OUString(EVOAB_DRIVER_IMPL_NAME); // this name is referenced in the configuration and in the evoab.xml @@ -87,7 +87,7 @@ OUString OEvoabDriver::getImplementationName_Static( ) throw(RuntimeException) } -Sequence< OUString > OEvoabDriver::getSupportedServiceNames_Static( ) throw (RuntimeException) +Sequence< OUString > OEvoabDriver::getSupportedServiceNames_Static( ) { // which service is supported // for more information @see com.sun.star.sdbc.Driver @@ -95,28 +95,28 @@ Sequence< OUString > OEvoabDriver::getSupportedServiceNames_Static( ) throw (Ru return aSNS; } -OUString SAL_CALL OEvoabDriver::getImplementationName( ) throw(RuntimeException, std::exception) +OUString SAL_CALL OEvoabDriver::getImplementationName( ) { return getImplementationName_Static(); } -sal_Bool SAL_CALL OEvoabDriver::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabDriver::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } -Sequence< OUString > SAL_CALL OEvoabDriver::getSupportedServiceNames( ) throw(RuntimeException, std::exception) +Sequence< OUString > SAL_CALL OEvoabDriver::getSupportedServiceNames( ) { return getSupportedServiceNames_Static(); } -css::uno::Reference< css::uno::XInterface > SAL_CALL connectivity::evoab::OEvoabDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception ) +css::uno::Reference< css::uno::XInterface > SAL_CALL connectivity::evoab::OEvoabDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) { return *(new OEvoabDriver(_rxFactory)); } -Reference< XConnection > SAL_CALL OEvoabDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > SAL_CALL OEvoabDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) { ::osl::MutexGuard aGuard( m_aMutex ); if (ODriver_BASE::rBHelper.bDisposed) @@ -134,13 +134,12 @@ Reference< XConnection > SAL_CALL OEvoabDriver::connect( const OUString& url, co } sal_Bool SAL_CALL OEvoabDriver::acceptsURL( const OUString& url ) - throw(SQLException, RuntimeException, std::exception) { return acceptsURL_Stat(url); } -Sequence< DriverPropertyInfo > SAL_CALL OEvoabDriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException, std::exception) +Sequence< DriverPropertyInfo > SAL_CALL OEvoabDriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) { if ( ! acceptsURL(url) ) { @@ -154,12 +153,12 @@ Sequence< DriverPropertyInfo > SAL_CALL OEvoabDriver::getPropertyInfo( const OUS } -sal_Int32 SAL_CALL OEvoabDriver::getMajorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDriver::getMajorVersion( ) { return 1; } -sal_Int32 SAL_CALL OEvoabDriver::getMinorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabDriver::getMinorVersion( ) { return 0; } diff --git a/connectivity/source/drivers/evoab2/NDriver.hxx b/connectivity/source/drivers/evoab2/NDriver.hxx index 952b9a060e5e..c0570e9186ce 100644 --- a/connectivity/source/drivers/evoab2/NDriver.hxx +++ b/connectivity/source/drivers/evoab2/NDriver.hxx @@ -34,7 +34,7 @@ namespace connectivity namespace evoab { /// @throws css::uno::Exception - css::uno::Reference< css::uno::XInterface > SAL_CALL OEvoabDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception ); + css::uno::Reference< css::uno::XInterface > SAL_CALL OEvoabDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory); typedef ::cppu::WeakComponentImplHelper< css::sdbc::XDriver, @@ -58,22 +58,22 @@ namespace connectivity // XInterface /// @throws css::uno::RuntimeException - static OUString getImplementationName_Static( ) throw(css::uno::RuntimeException); + static OUString getImplementationName_Static( ); /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (css::uno::RuntimeException); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static( ); // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XDriver - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMajorVersion( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMinorVersion( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override; + virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) override; + virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override; + virtual sal_Int32 SAL_CALL getMajorVersion( ) override; + virtual sal_Int32 SAL_CALL getMinorVersion( ) override; public: const css::uno::Reference< css::lang::XMultiServiceFactory > diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx index 4a11eb341ac2..f9448f098fe0 100644 --- a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx +++ b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx @@ -82,7 +82,7 @@ void SAL_CALL OEvoabPreparedStatement::release() throw() } -Any SAL_CALL OEvoabPreparedStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OEvoabPreparedStatement::queryInterface( const Type & rType ) { Any aRet = OCommonStatement::queryInterface(rType); if(!aRet.hasValue()) @@ -90,13 +90,13 @@ Any SAL_CALL OEvoabPreparedStatement::queryInterface( const Type & rType ) throw return aRet; } -Sequence< Type > SAL_CALL OEvoabPreparedStatement::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL OEvoabPreparedStatement::getTypes( ) { return ::comphelper::concatSequences(OPreparedStatement_BASE::getTypes(),OCommonStatement::getTypes()); } -Reference< XResultSetMetaData > SAL_CALL OEvoabPreparedStatement::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSetMetaData > SAL_CALL OEvoabPreparedStatement::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); @@ -107,7 +107,7 @@ Reference< XResultSetMetaData > SAL_CALL OEvoabPreparedStatement::getMetaData( } -void SAL_CALL OEvoabPreparedStatement::close( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::close( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); @@ -125,7 +125,7 @@ void SAL_CALL OEvoabPreparedStatement::close( ) throw(SQLException, RuntimeExce } -sal_Bool SAL_CALL OEvoabPreparedStatement::execute( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabPreparedStatement::execute( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); @@ -135,7 +135,7 @@ sal_Bool SAL_CALL OEvoabPreparedStatement::execute( ) throw(SQLException, Runti } -sal_Int32 SAL_CALL OEvoabPreparedStatement::executeUpdate( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabPreparedStatement::executeUpdate( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); @@ -144,13 +144,13 @@ sal_Int32 SAL_CALL OEvoabPreparedStatement::executeUpdate( ) throw(SQLException } -void SAL_CALL OEvoabPreparedStatement::setString( sal_Int32 /*parameterIndex*/, const OUString& /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setString( sal_Int32 /*parameterIndex*/, const OUString& /*x*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setString", *this ); } -Reference< XConnection > SAL_CALL OEvoabPreparedStatement::getConnection( ) throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > SAL_CALL OEvoabPreparedStatement::getConnection( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); @@ -159,7 +159,7 @@ Reference< XConnection > SAL_CALL OEvoabPreparedStatement::getConnection( ) thr } -Reference< XResultSet > SAL_CALL OEvoabPreparedStatement::executeQuery( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL OEvoabPreparedStatement::executeQuery( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); @@ -168,103 +168,103 @@ Reference< XResultSet > SAL_CALL OEvoabPreparedStatement::executeQuery( ) throw } -void SAL_CALL OEvoabPreparedStatement::setBoolean( sal_Int32 /*parameterIndex*/, sal_Bool /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setBoolean( sal_Int32 /*parameterIndex*/, sal_Bool /*x*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setBoolean", *this ); } -void SAL_CALL OEvoabPreparedStatement::setByte( sal_Int32 /*parameterIndex*/, sal_Int8 /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setByte( sal_Int32 /*parameterIndex*/, sal_Int8 /*x*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setByte", *this ); } -void SAL_CALL OEvoabPreparedStatement::setDate( sal_Int32 /*parameterIndex*/, const Date& /*aData*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setDate( sal_Int32 /*parameterIndex*/, const Date& /*aData*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setDate", *this ); } -void SAL_CALL OEvoabPreparedStatement::setTime( sal_Int32 /*parameterIndex*/, const css::util::Time& /*aVal*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setTime( sal_Int32 /*parameterIndex*/, const css::util::Time& /*aVal*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setTime", *this ); } -void SAL_CALL OEvoabPreparedStatement::setTimestamp( sal_Int32 /*parameterIndex*/, const DateTime& /*aVal*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setTimestamp( sal_Int32 /*parameterIndex*/, const DateTime& /*aVal*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setTimestamp", *this ); } -void SAL_CALL OEvoabPreparedStatement::setDouble( sal_Int32 /*parameterIndex*/, double /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setDouble( sal_Int32 /*parameterIndex*/, double /*x*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setDouble", *this ); } -void SAL_CALL OEvoabPreparedStatement::setFloat( sal_Int32 /*parameterIndex*/, float /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setFloat( sal_Int32 /*parameterIndex*/, float /*x*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setFloat", *this ); } -void SAL_CALL OEvoabPreparedStatement::setInt( sal_Int32 /*parameterIndex*/, sal_Int32 /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setInt( sal_Int32 /*parameterIndex*/, sal_Int32 /*x*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setInt", *this ); } -void SAL_CALL OEvoabPreparedStatement::setLong( sal_Int32 /*parameterIndex*/, sal_Int64 /*aVal*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setLong( sal_Int32 /*parameterIndex*/, sal_Int64 /*aVal*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setLong", *this ); } -void SAL_CALL OEvoabPreparedStatement::setNull( sal_Int32 /*parameterIndex*/, sal_Int32 /*sqlType*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setNull( sal_Int32 /*parameterIndex*/, sal_Int32 /*sqlType*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setNull", *this ); } -void SAL_CALL OEvoabPreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setClob", *this ); } -void SAL_CALL OEvoabPreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const Reference< XBlob >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const Reference< XBlob >& /*x*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setBlob", *this ); } -void SAL_CALL OEvoabPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setArray", *this ); } -void SAL_CALL OEvoabPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setRef", *this ); } -void SAL_CALL OEvoabPreparedStatement::setObjectWithInfo( sal_Int32 /*parameterIndex*/, const Any& /*x*/, sal_Int32 /*sqlType*/, sal_Int32 /*scale*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setObjectWithInfo( sal_Int32 /*parameterIndex*/, const Any& /*x*/, sal_Int32 /*sqlType*/, sal_Int32 /*scale*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setObjectWithInfo", *this ); } -void SAL_CALL OEvoabPreparedStatement::setObjectNull( sal_Int32 /*parameterIndex*/, sal_Int32 /*sqlType*/, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setObjectNull( sal_Int32 /*parameterIndex*/, sal_Int32 /*sqlType*/, const OUString& /*typeName*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setObjectNull", *this ); } -void SAL_CALL OEvoabPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) { if(!::dbtools::implSetObject(this,parameterIndex,x)) { @@ -277,45 +277,45 @@ void SAL_CALL OEvoabPreparedStatement::setObject( sal_Int32 parameterIndex, cons } -void SAL_CALL OEvoabPreparedStatement::setShort( sal_Int32 /*parameterIndex*/, sal_Int16 /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setShort( sal_Int32 /*parameterIndex*/, sal_Int16 /*x*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setShort", *this ); } -void SAL_CALL OEvoabPreparedStatement::setBytes( sal_Int32 /*parameterIndex*/, const Sequence< sal_Int8 >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setBytes( sal_Int32 /*parameterIndex*/, const Sequence< sal_Int8 >& /*x*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setBytes", *this ); } -void SAL_CALL OEvoabPreparedStatement::setCharacterStream( sal_Int32 /*parameterIndex*/, const Reference< XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setCharacterStream( sal_Int32 /*parameterIndex*/, const Reference< XInputStream >& /*x*/, sal_Int32 /*length*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setCharacterStream", *this ); } -void SAL_CALL OEvoabPreparedStatement::setBinaryStream( sal_Int32 /*parameterIndex*/, const Reference< XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::setBinaryStream( sal_Int32 /*parameterIndex*/, const Reference< XInputStream >& /*x*/, sal_Int32 /*length*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setBinaryStream", *this ); } -void SAL_CALL OEvoabPreparedStatement::clearParameters( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabPreparedStatement::clearParameters( ) { } -Reference< XResultSet > SAL_CALL OEvoabPreparedStatement::getResultSet( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL OEvoabPreparedStatement::getResultSet( ) { return nullptr; } -sal_Int32 SAL_CALL OEvoabPreparedStatement::getUpdateCount( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabPreparedStatement::getUpdateCount( ) { return 0; } -sal_Bool SAL_CALL OEvoabPreparedStatement::getMoreResults( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabPreparedStatement::getMoreResults( ) { return false; } diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx index 2c64888d3ee6..95cdc50d3176 100644 --- a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx +++ b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx @@ -80,49 +80,49 @@ namespace connectivity protected: DECLARE_SERVICE_INFO(); //XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; //XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; // XPreparedStatement - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL executeUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL execute( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( ) override; + virtual sal_Int32 SAL_CALL executeUpdate( ) override; + virtual sal_Bool SAL_CALL execute( ) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) override; // XParameters - virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearParameters( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) override; + virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) override; + virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) override; + virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) override; + virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) override; + virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) override; + virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) override; + virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) override; + virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) override; + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) override; + virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) override; + virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) override; + virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) override; + virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) override; + virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) override; + virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) override; + virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) override; + virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) override; + virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) override; + virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) override; + virtual void SAL_CALL clearParameters( ) override; // XCloseable - virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) override; // XResultSetMetaDataSupplier - virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) override; // XMultipleResults - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getUpdateCount( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getMoreResults( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet( ) override; + virtual sal_Int32 SAL_CALL getUpdateCount( ) override; + virtual sal_Bool SAL_CALL getMoreResults( ) override; }; } } diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx index c01026062c4c..d33c8f2a4512 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.cxx +++ b/connectivity/source/drivers/evoab2/NResultSet.cxx @@ -65,18 +65,18 @@ using namespace com::sun::star::io; namespace ErrorCondition = ::com::sun::star::sdb::ErrorCondition; -OUString SAL_CALL OEvoabResultSet::getImplementationName( ) throw ( RuntimeException, std::exception) +OUString SAL_CALL OEvoabResultSet::getImplementationName( ) { return OUString("com.sun.star.sdbcx.evoab.ResultSet"); } - Sequence< OUString > SAL_CALL OEvoabResultSet::getSupportedServiceNames( ) throw( RuntimeException, std::exception) + Sequence< OUString > SAL_CALL OEvoabResultSet::getSupportedServiceNames( ) { Sequence< OUString > aSupported { "com.sun.star.sdbc.ResultSet" }; return aSupported; } -sal_Bool SAL_CALL OEvoabResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabResultSet::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } @@ -720,7 +720,7 @@ void OEvoabResultSet::disposing() m_xMetaData.clear(); } -Any SAL_CALL OEvoabResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OEvoabResultSet::queryInterface( const Type & rType ) { Any aRet = ::comphelper::OPropertyContainer::queryInterface(rType); if(!aRet.hasValue()) @@ -728,7 +728,7 @@ Any SAL_CALL OEvoabResultSet::queryInterface( const Type & rType ) throw(Runtime return aRet; } -Sequence< Type > SAL_CALL OEvoabResultSet::getTypes( ) throw( RuntimeException, std::exception) +Sequence< Type > SAL_CALL OEvoabResultSet::getTypes( ) { return ::comphelper::concatSequences( OResultSet_BASE::getTypes(), @@ -746,7 +746,7 @@ Sequence< Type > SAL_CALL OEvoabResultSet::getTypes( ) throw( RuntimeException, * If the equivalent NResultSetMetaData.cxx marks the columntype of * nColumnNum as DataType::VARCHAR this accessor is used. */ -OUString SAL_CALL OEvoabResultSet::getString( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OEvoabResultSet::getString( sal_Int32 nColumnNum ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -761,7 +761,7 @@ OUString SAL_CALL OEvoabResultSet::getString( sal_Int32 nColumnNum ) throw(SQLEx return aResult; } -sal_Bool SAL_CALL OEvoabResultSet::getBoolean( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabResultSet::getBoolean( sal_Int32 nColumnNum ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -777,103 +777,103 @@ sal_Bool SAL_CALL OEvoabResultSet::getBoolean( sal_Int32 nColumnNum ) throw(SQLE return bResult; } -sal_Int64 SAL_CALL OEvoabResultSet::getLong( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Int64 SAL_CALL OEvoabResultSet::getLong( sal_Int32 /*nColumnNum*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getLong", *this ); return sal_Int64(); } -Reference< XArray > SAL_CALL OEvoabResultSet::getArray( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XArray > SAL_CALL OEvoabResultSet::getArray( sal_Int32 /*nColumnNum*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getArray", *this ); return nullptr; } -Reference< XClob > SAL_CALL OEvoabResultSet::getClob( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XClob > SAL_CALL OEvoabResultSet::getClob( sal_Int32 /*nColumnNum*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getClob", *this ); return nullptr; } -Reference< XBlob > SAL_CALL OEvoabResultSet::getBlob( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XBlob > SAL_CALL OEvoabResultSet::getBlob( sal_Int32 /*nColumnNum*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getBlob", *this ); return nullptr; } -Reference< XRef > SAL_CALL OEvoabResultSet::getRef( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XRef > SAL_CALL OEvoabResultSet::getRef( sal_Int32 /*nColumnNum*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getRef", *this ); return nullptr; } -Any SAL_CALL OEvoabResultSet::getObject( sal_Int32 /*nColumnNum*/, const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OEvoabResultSet::getObject( sal_Int32 /*nColumnNum*/, const Reference< css::container::XNameAccess >& /*typeMap*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getObject", *this ); return Any(); } -sal_Int16 SAL_CALL OEvoabResultSet::getShort( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Int16 SAL_CALL OEvoabResultSet::getShort( sal_Int32 /*nColumnNum*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getShort", *this ); return 0; } -css::util::Time SAL_CALL OEvoabResultSet::getTime( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +css::util::Time SAL_CALL OEvoabResultSet::getTime( sal_Int32 /*nColumnNum*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getTime", *this ); return css::util::Time(); } -util::DateTime SAL_CALL OEvoabResultSet::getTimestamp( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +util::DateTime SAL_CALL OEvoabResultSet::getTimestamp( sal_Int32 /*nColumnNum*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getTimestamp", *this ); return css::util::DateTime(); } -Reference< XInputStream > SAL_CALL OEvoabResultSet::getBinaryStream( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XInputStream > SAL_CALL OEvoabResultSet::getBinaryStream( sal_Int32 /*nColumnNum*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getBinaryStream", *this ); return nullptr; } -Reference< XInputStream > SAL_CALL OEvoabResultSet::getCharacterStream( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XInputStream > SAL_CALL OEvoabResultSet::getCharacterStream( sal_Int32 /*nColumnNum*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getCharacterStream", *this ); return nullptr; } -sal_Int8 SAL_CALL OEvoabResultSet::getByte( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Int8 SAL_CALL OEvoabResultSet::getByte( sal_Int32 /*nColumnNum*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getByte", *this ); return 0; } -Sequence< sal_Int8 > SAL_CALL OEvoabResultSet::getBytes( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +Sequence< sal_Int8 > SAL_CALL OEvoabResultSet::getBytes( sal_Int32 /*nColumnNum*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getBytes", *this ); return Sequence< sal_Int8 >(); } -css::util::Date SAL_CALL OEvoabResultSet::getDate( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +css::util::Date SAL_CALL OEvoabResultSet::getDate( sal_Int32 /*nColumnNum*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getDate", *this ); return css::util::Date(); } -double SAL_CALL OEvoabResultSet::getDouble( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +double SAL_CALL OEvoabResultSet::getDouble( sal_Int32 /*nColumnNum*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getDouble", *this ); return 0; } -float SAL_CALL OEvoabResultSet::getFloat( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +float SAL_CALL OEvoabResultSet::getFloat( sal_Int32 /*nColumnNum*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getFloat", *this ); return 0; } -sal_Int32 SAL_CALL OEvoabResultSet::getInt( sal_Int32 /*nColumnNum*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabResultSet::getInt( sal_Int32 /*nColumnNum*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getInt", *this ); return 0; @@ -882,7 +882,7 @@ sal_Int32 SAL_CALL OEvoabResultSet::getInt( sal_Int32 /*nColumnNum*/ ) throw(SQL // XResultSetMetaDataSupplier Interface -Reference< XResultSetMetaData > SAL_CALL OEvoabResultSet::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSetMetaData > SAL_CALL OEvoabResultSet::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -895,7 +895,7 @@ Reference< XResultSetMetaData > SAL_CALL OEvoabResultSet::getMetaData( ) throw( // XResultSet Interface -sal_Bool SAL_CALL OEvoabResultSet::next( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabResultSet::next( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -907,7 +907,7 @@ sal_Bool SAL_CALL OEvoabResultSet::next( ) throw(SQLException, RuntimeException return false; } -sal_Bool SAL_CALL OEvoabResultSet::wasNull( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabResultSet::wasNull( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -915,7 +915,7 @@ sal_Bool SAL_CALL OEvoabResultSet::wasNull( ) throw(SQLException, RuntimeExcept return m_bWasNull; } -sal_Bool SAL_CALL OEvoabResultSet::isBeforeFirst( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabResultSet::isBeforeFirst( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -923,7 +923,7 @@ sal_Bool SAL_CALL OEvoabResultSet::isBeforeFirst( ) throw(SQLException, Runtime return m_nIndex < 0; } -sal_Int32 SAL_CALL OEvoabResultSet::getRow( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabResultSet::getRow( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -931,7 +931,7 @@ sal_Int32 SAL_CALL OEvoabResultSet::getRow( ) throw(SQLException, RuntimeExcept return m_nIndex; } -sal_Bool SAL_CALL OEvoabResultSet::isAfterLast( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabResultSet::isAfterLast( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -939,7 +939,7 @@ sal_Bool SAL_CALL OEvoabResultSet::isAfterLast( ) throw(SQLException, RuntimeEx return m_nIndex >= m_nLength; } -sal_Bool SAL_CALL OEvoabResultSet::isFirst( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabResultSet::isFirst( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -947,7 +947,7 @@ sal_Bool SAL_CALL OEvoabResultSet::isFirst( ) throw(SQLException, RuntimeExcept return m_nIndex == 0; } -sal_Bool SAL_CALL OEvoabResultSet::isLast( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabResultSet::isLast( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -955,7 +955,7 @@ sal_Bool SAL_CALL OEvoabResultSet::isLast( ) throw(SQLException, RuntimeExcepti return m_nIndex == m_nLength - 1; } -void SAL_CALL OEvoabResultSet::beforeFirst( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabResultSet::beforeFirst( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -963,7 +963,7 @@ void SAL_CALL OEvoabResultSet::beforeFirst( ) throw(SQLException, RuntimeExcept m_nIndex = -1; } -void SAL_CALL OEvoabResultSet::afterLast( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabResultSet::afterLast( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -972,7 +972,7 @@ void SAL_CALL OEvoabResultSet::afterLast( ) throw(SQLException, RuntimeExceptio } -sal_Bool SAL_CALL OEvoabResultSet::first( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabResultSet::first( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -982,7 +982,7 @@ sal_Bool SAL_CALL OEvoabResultSet::first( ) throw(SQLException, RuntimeExceptio } -sal_Bool SAL_CALL OEvoabResultSet::last( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabResultSet::last( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -991,7 +991,7 @@ sal_Bool SAL_CALL OEvoabResultSet::last( ) throw(SQLException, RuntimeException return true; } -sal_Bool SAL_CALL OEvoabResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabResultSet::absolute( sal_Int32 row ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1003,7 +1003,7 @@ sal_Bool SAL_CALL OEvoabResultSet::absolute( sal_Int32 row ) throw(SQLException, return false; } -sal_Bool SAL_CALL OEvoabResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabResultSet::relative( sal_Int32 row ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1016,7 +1016,7 @@ sal_Bool SAL_CALL OEvoabResultSet::relative( sal_Int32 row ) throw(SQLException, return false; } -sal_Bool SAL_CALL OEvoabResultSet::previous( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabResultSet::previous( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1029,7 +1029,7 @@ sal_Bool SAL_CALL OEvoabResultSet::previous( ) throw(SQLException, RuntimeExcep return false; } -Reference< XInterface > SAL_CALL OEvoabResultSet::getStatement( ) throw(SQLException, RuntimeException, std::exception) +Reference< XInterface > SAL_CALL OEvoabResultSet::getStatement( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1038,7 +1038,7 @@ css::uno::WeakReferenceHelper aStatement(static_cast(m_pState } -sal_Bool SAL_CALL OEvoabResultSet::rowDeleted( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabResultSet::rowDeleted( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1046,7 +1046,7 @@ sal_Bool SAL_CALL OEvoabResultSet::rowDeleted( ) throw(SQLException, RuntimeExc return false; } -sal_Bool SAL_CALL OEvoabResultSet::rowInserted( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabResultSet::rowInserted( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1054,7 +1054,7 @@ sal_Bool SAL_CALL OEvoabResultSet::rowInserted( ) throw(SQLException, RuntimeEx return false; } -sal_Bool SAL_CALL OEvoabResultSet::rowUpdated( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OEvoabResultSet::rowUpdated( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1062,7 +1062,7 @@ sal_Bool SAL_CALL OEvoabResultSet::rowUpdated( ) throw(SQLException, RuntimeExc return false; } -void SAL_CALL OEvoabResultSet::refreshRow( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabResultSet::refreshRow( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1071,14 +1071,14 @@ void SAL_CALL OEvoabResultSet::refreshRow( ) throw(SQLException, RuntimeExcepti // XCancellable -void SAL_CALL OEvoabResultSet::cancel( ) throw(RuntimeException, std::exception) +void SAL_CALL OEvoabResultSet::cancel( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); } //XCloseable -void SAL_CALL OEvoabResultSet::close( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabResultSet::close( ) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -1089,18 +1089,18 @@ void SAL_CALL OEvoabResultSet::close( ) throw(SQLException, RuntimeException, s // XWarningsSupplier -void SAL_CALL OEvoabResultSet::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OEvoabResultSet::clearWarnings( ) { m_aWarnings.clearWarnings(); } -Any SAL_CALL OEvoabResultSet::getWarnings( ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OEvoabResultSet::getWarnings( ) { return m_aWarnings.getWarnings(); } //XColumnLocate Interface -sal_Int32 SAL_CALL OEvoabResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OEvoabResultSet::findColumn( const OUString& columnName ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -1147,7 +1147,7 @@ void SAL_CALL OEvoabResultSet::release() throw() } css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL -OEvoabResultSet::getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) +OEvoabResultSet::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/evoab2/NResultSet.hxx b/connectivity/source/drivers/evoab2/NResultSet.hxx index 422ef5ac7ee5..6d506dc238e9 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.hxx +++ b/connectivity/source/drivers/evoab2/NResultSet.hxx @@ -131,64 +131,64 @@ namespace connectivity // ::cppu::OComponentHelper virtual void SAL_CALL disposing() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; //XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; // XResultSet - virtual sal_Bool SAL_CALL next( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isBeforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAfterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL beforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL afterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL first( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL last( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL previous( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL refreshRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowUpdated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowInserted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowDeleted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL next( ) override; + virtual sal_Bool SAL_CALL isBeforeFirst( ) override; + virtual sal_Bool SAL_CALL isAfterLast( ) override; + virtual sal_Bool SAL_CALL isFirst( ) override; + virtual sal_Bool SAL_CALL isLast( ) override; + virtual void SAL_CALL beforeFirst( ) override; + virtual void SAL_CALL afterLast( ) override; + virtual sal_Bool SAL_CALL first( ) override; + virtual sal_Bool SAL_CALL last( ) override; + virtual sal_Int32 SAL_CALL getRow( ) override; + virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) override; + virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) override; + virtual sal_Bool SAL_CALL previous( ) override; + virtual void SAL_CALL refreshRow( ) override; + virtual sal_Bool SAL_CALL rowUpdated( ) override; + virtual sal_Bool SAL_CALL rowInserted( ) override; + virtual sal_Bool SAL_CALL rowDeleted( ) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement( ) override; // XRow - virtual sal_Bool SAL_CALL wasNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL wasNull( ) override; + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) override; + virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override; + virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override; + virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override; + virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) override; + virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) override; + virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) override; + virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) override; + virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) override; + virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) override; + virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) override; + virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; + virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override; // XCancellable - virtual void SAL_CALL cancel( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cancel( ) override; // XCloseable - virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) override; // XResultSetMetaDataSupplier - virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) override; // XWarningsSupplier - virtual css::uno::Any SAL_CALL getWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getWarnings( ) override; + virtual void SAL_CALL clearWarnings( ) override; // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) override; }; } } diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx index 4f742a625899..8e0fda36dcbc 100644 --- a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx +++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx @@ -39,7 +39,7 @@ OEvoabResultSetMetaData::~OEvoabResultSetMetaData() { } -void OEvoabResultSetMetaData::setEvoabFields(const ::rtl::Reference &xColumns) throw(SQLException) +void OEvoabResultSetMetaData::setEvoabFields(const ::rtl::Reference &xColumns) { OSQLColumns::Vector::const_iterator aIter; static const char aName[] = "Name"; @@ -64,45 +64,45 @@ void OEvoabResultSetMetaData::setEvoabFields(const ::rtl::Reference &xColumns) throw(css::sdbc::SQLException); + void setEvoabFields(const ::rtl::Reference &xColumns); inline sal_uInt32 fieldAtColumn(sal_Int32 columnIndex) const { return m_aEvoabFields[columnIndex - 1]; } inline sal_Int32 getFieldSize() const @@ -53,27 +53,27 @@ namespace connectivity inline operator css::uno::Reference< css::sdbc::XResultSetMetaData > () throw() { return this; } - virtual sal_Int32 SAL_CALL getColumnCount( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getColumnCount( ) override; + virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnName( sal_Int32 column ) override; + virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) override; + virtual OUString SAL_CALL getTableName( sal_Int32 column ) override; + virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) override; }; } } diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx index 4cad191ccaa5..386952c0a265 100644 --- a/connectivity/source/drivers/evoab2/NStatement.cxx +++ b/connectivity/source/drivers/evoab2/NStatement.cxx @@ -135,7 +135,7 @@ void OCommonStatement::disposing() OCommonStatement_IBase::disposing(); } -Any SAL_CALL OCommonStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OCommonStatement::queryInterface( const Type & rType ) { Any aRet = OCommonStatement_IBase::queryInterface(rType); if(!aRet.hasValue()) @@ -143,7 +143,7 @@ Any SAL_CALL OCommonStatement::queryInterface( const Type & rType ) throw(Runtim return aRet; } -Sequence< Type > SAL_CALL OCommonStatement::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL OCommonStatement::getTypes( ) { ::cppu::OTypeCollection aTypes( cppu::UnoType::get(), cppu::UnoType::get(), @@ -161,7 +161,7 @@ Sequence< Type > SAL_CALL OCommonStatement::getTypes( ) throw(RuntimeException, //} -void SAL_CALL OCommonStatement::close( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OCommonStatement::close( ) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -490,7 +490,7 @@ void OCommonStatement::parseSql( const OUString& sql, QueryData& _out_rQueryData } -Reference< XConnection > SAL_CALL OStatement::getConnection( ) throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > SAL_CALL OStatement::getConnection( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); @@ -500,7 +500,7 @@ Reference< XConnection > SAL_CALL OStatement::getConnection( ) throw(SQLExcepti } -Any SAL_CALL OCommonStatement::getWarnings( ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OCommonStatement::getWarnings( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); @@ -510,7 +510,7 @@ Any SAL_CALL OCommonStatement::getWarnings( ) throw(SQLException, RuntimeExcept } -void SAL_CALL OCommonStatement::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OCommonStatement::clearWarnings( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); @@ -590,7 +590,7 @@ Reference< XResultSet > OCommonStatement::impl_executeQuery_throw( const OUStrin } -Reference< XPropertySetInfo > SAL_CALL OCommonStatement::getPropertySetInfo( ) throw(RuntimeException, std::exception) +Reference< XPropertySetInfo > SAL_CALL OCommonStatement::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo( getInfoHelper() ); } @@ -608,7 +608,7 @@ IMPLEMENT_FORWARD_XINTERFACE2( OStatement, OCommonStatement, OStatement_IBase ) IMPLEMENT_FORWARD_XTYPEPROVIDER2( OStatement, OCommonStatement, OStatement_IBase ) -sal_Bool SAL_CALL OStatement::execute( const OUString& _sql ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OStatement::execute( const OUString& _sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); @@ -618,7 +618,7 @@ sal_Bool SAL_CALL OStatement::execute( const OUString& _sql ) throw(SQLException } -Reference< XResultSet > SAL_CALL OStatement::executeQuery( const OUString& _sql ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL OStatement::executeQuery( const OUString& _sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); @@ -627,7 +627,7 @@ Reference< XResultSet > SAL_CALL OStatement::executeQuery( const OUString& _sql } -sal_Int32 SAL_CALL OStatement::executeUpdate( const OUString& /*sql*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OStatement::executeUpdate( const OUString& /*sql*/ ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBase::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx b/connectivity/source/drivers/evoab2/NStatement.hxx index efdc5f2f124e..c5cc7ef510e0 100644 --- a/connectivity/source/drivers/evoab2/NStatement.hxx +++ b/connectivity/source/drivers/evoab2/NStatement.hxx @@ -211,19 +211,19 @@ namespace connectivity virtual void SAL_CALL release() throw() override; virtual void SAL_CALL acquire() throw() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; //XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; // XWarningsSupplier - virtual css::uno::Any SAL_CALL getWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getWarnings( ) override; + virtual void SAL_CALL clearWarnings( ) override; // XCloseable - virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) override; protected: /** will return the EBookQuery representing the statement WHERE condition, or throw @@ -262,7 +262,7 @@ namespace connectivity } // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; @@ -273,10 +273,10 @@ namespace connectivity DECLARE_SERVICE_INFO(); // XStatement - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ; - virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ; - virtual sal_Bool SAL_CALL execute( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ; - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) override ; + virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) override ; + virtual sal_Bool SAL_CALL execute( const OUString& sql ) override ; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) override ; }; } } diff --git a/connectivity/source/drivers/evoab2/NTables.cxx b/connectivity/source/drivers/evoab2/NTables.cxx index 163b721eb7ff..587cdc632b05 100644 --- a/connectivity/source/drivers/evoab2/NTables.cxx +++ b/connectivity/source/drivers/evoab2/NTables.cxx @@ -75,7 +75,7 @@ ObjectType OEvoabTables::createObject(const OUString& aName) return xRet; } -void OEvoabTables::impl_refresh( ) throw(RuntimeException) +void OEvoabTables::impl_refresh( ) { static_cast(m_rParent).refreshTables(); } diff --git a/connectivity/source/drivers/evoab2/NTables.hxx b/connectivity/source/drivers/evoab2/NTables.hxx index 1977863cb38c..b1acf94daac7 100644 --- a/connectivity/source/drivers/evoab2/NTables.hxx +++ b/connectivity/source/drivers/evoab2/NTables.hxx @@ -30,7 +30,7 @@ namespace connectivity css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xMetaData; protected: virtual sdbcx::ObjectType createObject(const OUString& _rName) override; - virtual void impl_refresh() throw(css::uno::RuntimeException) override; + virtual void impl_refresh() override; public: OEvoabTables(const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _rMetaData, ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, diff --git a/connectivity/source/drivers/file/FCatalog.cxx b/connectivity/source/drivers/file/FCatalog.cxx index 12dd47a4076c..a5bcd71948c5 100644 --- a/connectivity/source/drivers/file/FCatalog.cxx +++ b/connectivity/source/drivers/file/FCatalog.cxx @@ -66,7 +66,7 @@ void OFileCatalog::refreshTables() } -Any SAL_CALL OFileCatalog::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OFileCatalog::queryInterface( const Type & rType ) { if( rType == cppu::UnoType::get()|| rType == cppu::UnoType::get()|| @@ -78,7 +78,7 @@ Any SAL_CALL OFileCatalog::queryInterface( const Type & rType ) throw(RuntimeExc return OFileCatalog_BASE::queryInterface(rType); } -Sequence< Type > SAL_CALL OFileCatalog::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL OFileCatalog::getTypes( ) { typedef sdbcx::OCatalog OFileCatalog_BASE; diff --git a/connectivity/source/drivers/file/FColumns.cxx b/connectivity/source/drivers/file/FColumns.cxx index 2956e5e0fed6..a380dc8e6f5f 100644 --- a/connectivity/source/drivers/file/FColumns.cxx +++ b/connectivity/source/drivers/file/FColumns.cxx @@ -75,7 +75,7 @@ sdbcx::ObjectType OColumns::createObject(const OUString& _rName) return xRet; } -void OColumns::impl_refresh() throw(RuntimeException) +void OColumns::impl_refresh() { m_pTable->refreshColumns(); } diff --git a/connectivity/source/drivers/file/FConnection.cxx b/connectivity/source/drivers/file/FConnection.cxx index d77f1b411b29..27d2b2d9ee03 100644 --- a/connectivity/source/drivers/file/FConnection.cxx +++ b/connectivity/source/drivers/file/FConnection.cxx @@ -94,10 +94,6 @@ bool OConnection::matchesExtension( const OUString& _rExt ) const void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& info) - throw( css::sdbc::SQLException, - css::uno::RuntimeException, - css::uno::DeploymentException, - std::exception) { osl_atomic_increment( &m_refCount ); @@ -218,7 +214,7 @@ void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& IMPLEMENT_SERVICE_INFO(OConnection, "com.sun.star.sdbc.drivers.file.Connection", "com.sun.star.sdbc.Connection") -Reference< XStatement > SAL_CALL OConnection::createStatement( ) throw(SQLException, RuntimeException, std::exception) +Reference< XStatement > SAL_CALL OConnection::createStatement( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -229,7 +225,7 @@ Reference< XStatement > SAL_CALL OConnection::createStatement( ) throw(SQLExcep return xReturn; } -Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -242,18 +238,18 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OU return pStmt; } -Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& /*sql*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& /*sql*/ ) { throwFeatureNotImplementedSQLException( "XConnection::prepareCall", *this ); return nullptr; } -OUString SAL_CALL OConnection::nativeSQL( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OConnection::nativeSQL( const OUString& sql ) { return sql; } -void SAL_CALL OConnection::setAutoCommit( sal_Bool autoCommit ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::setAutoCommit( sal_Bool autoCommit ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -261,7 +257,7 @@ void SAL_CALL OConnection::setAutoCommit( sal_Bool autoCommit ) throw(SQLExcepti m_bAutoCommit = autoCommit; } -sal_Bool SAL_CALL OConnection::getAutoCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OConnection::getAutoCommit( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -269,22 +265,22 @@ sal_Bool SAL_CALL OConnection::getAutoCommit( ) throw(SQLException, RuntimeExce return m_bAutoCommit; } -void SAL_CALL OConnection::commit( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::commit( ) { } -void SAL_CALL OConnection::rollback( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::rollback( ) { } -sal_Bool SAL_CALL OConnection::isClosed( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OConnection::isClosed( ) { ::osl::MutexGuard aGuard( m_aMutex ); return OConnection_BASE::rBHelper.bDisposed; } -Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -300,7 +296,7 @@ Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData( ) throw(SQLEx return xMetaData; } -void SAL_CALL OConnection::setReadOnly( sal_Bool readOnly ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::setReadOnly( sal_Bool readOnly ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -309,7 +305,7 @@ void SAL_CALL OConnection::setReadOnly( sal_Bool readOnly ) throw(SQLException, m_bReadOnly = readOnly; } -sal_Bool SAL_CALL OConnection::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OConnection::isReadOnly( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -318,37 +314,37 @@ sal_Bool SAL_CALL OConnection::isReadOnly( ) throw(SQLException, RuntimeExcepti return m_bReadOnly; } -void SAL_CALL OConnection::setCatalog( const OUString& /*catalog*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::setCatalog( const OUString& /*catalog*/ ) { throwFeatureNotImplementedSQLException( "XConnection::setCatalog", *this ); } -OUString SAL_CALL OConnection::getCatalog( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OConnection::getCatalog( ) { return OUString(); } -void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 /*level*/ ) { throwFeatureNotImplementedSQLException( "XConnection::setTransactionIsolation", *this ); } -sal_Int32 SAL_CALL OConnection::getTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OConnection::getTransactionIsolation( ) { return 0; } -Reference< XNameAccess > SAL_CALL OConnection::getTypeMap( ) throw(SQLException, RuntimeException, std::exception) +Reference< XNameAccess > SAL_CALL OConnection::getTypeMap( ) { return nullptr; } -void SAL_CALL OConnection::setTypeMap( const Reference< XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::setTypeMap( const Reference< XNameAccess >& /*typeMap*/ ) { } // XCloseable -void SAL_CALL OConnection::close( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::close( ) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -359,12 +355,12 @@ void SAL_CALL OConnection::close( ) throw(SQLException, RuntimeException, std:: } // XWarningsSupplier -Any SAL_CALL OConnection::getWarnings( ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OConnection::getWarnings( ) { return Any(); } -void SAL_CALL OConnection::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::clearWarnings( ) { } @@ -409,7 +405,7 @@ Reference< XDynamicResultSet > OConnection::getDir() const return xContent; } -sal_Int64 SAL_CALL OConnection::getSomething( const Sequence< sal_Int8 >& rId ) throw (RuntimeException, std::exception) +sal_Int64 SAL_CALL OConnection::getSomething( const Sequence< sal_Int8 >& rId ) { return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) ? reinterpret_cast< sal_Int64 >( this ) diff --git a/connectivity/source/drivers/file/FDatabaseMetaData.cxx b/connectivity/source/drivers/file/FDatabaseMetaData.cxx index e3bc0d7ae89f..05f2fc499154 100644 --- a/connectivity/source/drivers/file/FDatabaseMetaData.cxx +++ b/connectivity/source/drivers/file/FDatabaseMetaData.cxx @@ -64,7 +64,7 @@ OUString ODatabaseMetaData::impl_getCatalogSeparator_throw( ) Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*tableNamePattern*/, - const OUString& /*columnNamePattern*/ ) throw(SQLException, RuntimeException, std::exception) + const OUString& /*columnNamePattern*/ ) { SAL_WARN("connectivity.drivers", "ODatabaseMetaData::getColumns() should be overridden!"); return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eColumns ); @@ -156,7 +156,7 @@ namespace Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( const Any& /*catalog*/, const OUString& /*schemaPattern*/, - const OUString& tableNamePattern, const Sequence< OUString >& types ) throw(SQLException, RuntimeException, std::exception) + const OUString& tableNamePattern, const Sequence< OUString >& types ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -308,47 +308,47 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( return xRef; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength( ) { return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize( ) { return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength( ) { return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength( ) { return SAL_MAX_INT32; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength( ) { return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex( ) { return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength( ) { return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections( ) { return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable( ) { return 0; } @@ -358,7 +358,7 @@ sal_Int32 ODatabaseMetaData::impl_getMaxStatements_throw( ) return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength( ) { return 0; } @@ -369,7 +369,7 @@ sal_Int32 ODatabaseMetaData::impl_getMaxTablesInSelect_throw( ) } Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( - const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern ) throw(SQLException, RuntimeException, std::exception) + const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -437,17 +437,17 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( return xRef; } -sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers( ) { return false; } @@ -457,17 +457,17 @@ bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) return false; } -sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers( ) { return false; } @@ -482,17 +482,17 @@ bool ODatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw( ) return false; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength( ) { return 0; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) { return false; } -OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) { return OUString(); } @@ -502,12 +502,12 @@ OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( ) return OUString("\""); } -OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) { return OUString(); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( ) { return true; } @@ -517,57 +517,57 @@ bool ODatabaseMetaData::impl_isCatalogAtStart_throw( ) return true; } -sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 /*level*/ ) { return false; } @@ -577,22 +577,22 @@ bool ODatabaseMetaData::impl_supportsSchemasInDataManipulation_throw( ) return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions( ) { return false; } @@ -607,7 +607,7 @@ bool ODatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw( ) return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions( ) { return false; } @@ -617,12 +617,12 @@ bool ODatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw( ) return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins( ) { return false; } -Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -640,137 +640,137 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLE return xRef; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength( ) { return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength( ) { return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength( ) { return 0; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, sal_Int32 /*toType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, sal_Int32 /*toType*/ ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers( ) { return true; } @@ -780,207 +780,207 @@ bool ODatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw( ) return false; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) { return false; } -OUString SAL_CALL ODatabaseMetaData::getURL( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getURL( ) { return OUString( "sdbc:file:" ); } -OUString SAL_CALL ODatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getUserName( ) { return OUString(); } -OUString SAL_CALL ODatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getDriverName( ) { return OUString(); } -OUString SAL_CALL ODatabaseMetaData::getDriverVersion( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getDriverVersion( ) { return OUString::number(1); } -OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) { return OUString::number(0); } -OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) { return OUString(); } -OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) { return OUString(); } -OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) { return OUString(); } -sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion( ) { return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation( ) { return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) { return 0; } -OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) { return OUString(); } -OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) { return OUString(); } -OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) { return OUString("UCASE,LCASE,ASCII,LENGTH,OCTET_LENGTH,CHAR_LENGTH,CHARACTER_LENGTH,CHAR,CONCAT,LOCATE,SUBSTRING,LTRIM,RTRIM,SPACE,REPLACE,REPEAT,INSERT,LEFT,RIGHT"); } -OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) { return OUString("DAYOFWEEK,DAYOFMONTH,DAYOFYEAR,MONTH,DAYNAME,MONTHNAME,QUARTER,WEEK,YEAR,HOUR,MINUTE,SECOND,CURDATE,CURTIME,NOW"); } -OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) { return OUString(); } -OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) { return OUString("ABS,SIGN,MOD,FLOOR,CEILING,ROUND,EXP,LN,LOG,LOG10,POWER,SQRT,PI,COS,SIN,TAN,ACOS,ASIN,ATAN,ATAN2,DEGREES,RADIANS"); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins( ) { return false; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy( ) { return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy( ) { return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect( ) { return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength( ) { return 0; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 setType ) { switch(setType) { @@ -993,7 +993,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 setType ) return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 /*concurrency*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 /*concurrency*/ ) { switch(setType) { @@ -1006,57 +1006,57 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 set return false; } -sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 /*setType*/ ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 /*setType*/ ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 /*setType*/ ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 /*setType*/ ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 /*setType*/ ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 /*setType*/ ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 /*setType*/ ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 /*setType*/ ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 /*setType*/ ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates( ) { return false; } -Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) { return nullptr; } diff --git a/connectivity/source/drivers/file/FDriver.cxx b/connectivity/source/drivers/file/FDriver.cxx index 15432f740523..a0a1427954e9 100644 --- a/connectivity/source/drivers/file/FDriver.cxx +++ b/connectivity/source/drivers/file/FDriver.cxx @@ -60,12 +60,12 @@ void OFileDriver::disposing() // static ServiceInfo -OUString OFileDriver::getImplementationName_Static( ) throw(RuntimeException) +OUString OFileDriver::getImplementationName_Static( ) { return OUString("com.sun.star.sdbc.driver.file.Driver"); } -Sequence< OUString > OFileDriver::getSupportedServiceNames_Static( ) throw (RuntimeException) +Sequence< OUString > OFileDriver::getSupportedServiceNames_Static( ) { Sequence< OUString > aSNS( 2 ); aSNS[0] = "com.sun.star.sdbc.Driver"; @@ -74,24 +74,24 @@ Sequence< OUString > OFileDriver::getSupportedServiceNames_Static( ) throw (Run } -OUString SAL_CALL OFileDriver::getImplementationName( ) throw(RuntimeException, std::exception) +OUString SAL_CALL OFileDriver::getImplementationName( ) { return getImplementationName_Static(); } -sal_Bool SAL_CALL OFileDriver::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL OFileDriver::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } -Sequence< OUString > SAL_CALL OFileDriver::getSupportedServiceNames( ) throw(RuntimeException, std::exception) +Sequence< OUString > SAL_CALL OFileDriver::getSupportedServiceNames( ) { return getSupportedServiceNames_Static(); } -Reference< XConnection > SAL_CALL OFileDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > SAL_CALL OFileDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODriver_BASE::rBHelper.bDisposed); @@ -105,12 +105,11 @@ Reference< XConnection > SAL_CALL OFileDriver::connect( const OUString& url, con } sal_Bool SAL_CALL OFileDriver::acceptsURL( const OUString& url ) - throw(SQLException, RuntimeException, std::exception) { return url.startsWith("sdbc:file:"); } -Sequence< DriverPropertyInfo > SAL_CALL OFileDriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException, std::exception) +Sequence< DriverPropertyInfo > SAL_CALL OFileDriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) { if ( acceptsURL(url) ) { @@ -172,19 +171,19 @@ Sequence< DriverPropertyInfo > SAL_CALL OFileDriver::getPropertyInfo( const OUSt return Sequence< DriverPropertyInfo >(); } -sal_Int32 SAL_CALL OFileDriver::getMajorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL OFileDriver::getMajorVersion( ) { return 1; } -sal_Int32 SAL_CALL OFileDriver::getMinorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL OFileDriver::getMinorVersion( ) { return 0; } // XDataDefinitionSupplier -Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByConnection( const Reference< css::sdbc::XConnection >& connection ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByConnection( const Reference< css::sdbc::XConnection >& connection ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODriver_BASE::rBHelper.bDisposed); @@ -211,7 +210,7 @@ Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByConnection } -Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +Reference< XTablesSupplier > SAL_CALL OFileDriver::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) { if ( ! acceptsURL(url) ) { diff --git a/connectivity/source/drivers/file/FPreparedStatement.cxx b/connectivity/source/drivers/file/FPreparedStatement.cxx index c59496af98f2..22f3449e4aaf 100644 --- a/connectivity/source/drivers/file/FPreparedStatement.cxx +++ b/connectivity/source/drivers/file/FPreparedStatement.cxx @@ -75,7 +75,7 @@ void OPreparedStatement::disposing() } } -void OPreparedStatement::construct(const OUString& sql) throw(SQLException, RuntimeException, std::exception) +void OPreparedStatement::construct(const OUString& sql) { OStatement_Base::construct(sql); @@ -108,7 +108,7 @@ rtl::Reference OPreparedStatement::makeResultSet() return xResultSet; } -Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) { Any aRet = OStatement_BASE2::queryInterface(rType); return aRet.hasValue() ? aRet : ::cppu::queryInterface( rType, @@ -117,7 +117,7 @@ Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(Runt static_cast< XResultSetMetaDataSupplier*>(this)); } -css::uno::Sequence< css::uno::Type > SAL_CALL OPreparedStatement::getTypes( ) throw(css::uno::RuntimeException, std::exception) +css::uno::Sequence< css::uno::Type > SAL_CALL OPreparedStatement::getTypes( ) { ::cppu::OTypeCollection aTypes( cppu::UnoType::get(), cppu::UnoType::get(), @@ -127,7 +127,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL OPreparedStatement::getTypes( ) t } -Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -139,7 +139,7 @@ Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData( ) thr } -void SAL_CALL OPreparedStatement::close( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::close( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -148,7 +148,7 @@ void SAL_CALL OPreparedStatement::close( ) throw(SQLException, RuntimeException } -sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OPreparedStatement::execute( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -162,7 +162,7 @@ sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeExc } -sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -180,13 +180,13 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) throw(SQLException, Run } -void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) { setParameter(parameterIndex,x); } -Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( ) throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -195,7 +195,7 @@ Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( ) throw(SQ } -Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -204,59 +204,59 @@ Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) throw(SQLE } -void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) { setParameter(parameterIndex,static_cast(x)); } -void SAL_CALL OPreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x ) { setParameter(parameterIndex,x); } -void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const util::Date& aData ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const util::Date& aData ) { setParameter(parameterIndex,DBTypeConversion::toDouble(aData)); } -void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const util::Time& aVal ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const util::Time& aVal ) { setParameter(parameterIndex,DBTypeConversion::toDouble(aVal)); } -void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const util::DateTime& aVal ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const util::DateTime& aVal ) { setParameter(parameterIndex,DBTypeConversion::toDouble(aVal)); } -void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) { setParameter(parameterIndex,x); } -void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) { setParameter(parameterIndex,x); } -void SAL_CALL OPreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x ) { setParameter(parameterIndex,x); } -void SAL_CALL OPreparedStatement::setLong( sal_Int32 /*parameterIndex*/, sal_Int64 /*aVal*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setLong( sal_Int32 /*parameterIndex*/, sal_Int64 /*aVal*/ ) { throwFeatureNotImplementedSQLException( "XParameters::setLong", *this ); } -void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/ ) { ::osl::MutexGuard aGuard( m_aMutex ); checkAndResizeParameters(parameterIndex); @@ -268,31 +268,31 @@ void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 / } -void SAL_CALL OPreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ ) { throwFeatureNotImplementedSQLException( "XParameters::setClob", *this ); } -void SAL_CALL OPreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const Reference< XBlob >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const Reference< XBlob >& /*x*/ ) { throwFeatureNotImplementedSQLException( "XParameters::setBlob", *this ); } -void SAL_CALL OPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) { throwFeatureNotImplementedSQLException( "XParameters::setArray", *this ); } -void SAL_CALL OPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ ) { throwFeatureNotImplementedSQLException( "XParameters::setRef", *this ); } -void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 sqlType, sal_Int32 scale ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 sqlType, sal_Int32 scale ) { switch(sqlType) { @@ -307,13 +307,13 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, c } -void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) { setNull(parameterIndex,sqlType); } -void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) { if(!::dbtools::implSetObject(this,parameterIndex,x)) { @@ -327,25 +327,25 @@ void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any } -void SAL_CALL OPreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x ) { setParameter(parameterIndex,x); } -void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x ) { setParameter(parameterIndex,x); } -void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) { setBinaryStream(parameterIndex,x,length ); } -void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) { if(!x.is()) ::dbtools::throwFunctionSequenceException(*this); @@ -356,7 +356,7 @@ void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, con } -void SAL_CALL OPreparedStatement::clearParameters( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::clearParameters( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/file/FResultSet.cxx b/connectivity/source/drivers/file/FResultSet.cxx index fe4341152793..f1ef8644e27d 100644 --- a/connectivity/source/drivers/file/FResultSet.cxx +++ b/connectivity/source/drivers/file/FResultSet.cxx @@ -160,13 +160,13 @@ void OResultSet::disposing() m_aSkipDeletedSet.clear(); } -Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OResultSet::queryInterface( const Type & rType ) { Any aRet = OPropertySetHelper::queryInterface(rType); return aRet.hasValue() ? aRet : OResultSet_BASE::queryInterface(rType); } -Sequence< Type > SAL_CALL OResultSet::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL OResultSet::getTypes( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -178,7 +178,7 @@ Sequence< Type > SAL_CALL OResultSet::getTypes( ) throw(RuntimeException, std:: } -sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -200,7 +200,6 @@ sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQ } const ORowSetValue& OResultSet::getValue(sal_Int32 columnIndex) - throw (css::sdbc::SQLException, css::uno::RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -212,67 +211,67 @@ const ORowSetValue& OResultSet::getValue(sal_Int32 columnIndex) return *(m_aSelectRow->get())[columnIndex]; } -void OResultSet::checkIndex(sal_Int32 columnIndex ) throw(css::sdbc::SQLException) +void OResultSet::checkIndex(sal_Int32 columnIndex ) { if ( columnIndex <= 0 || columnIndex >= m_nColumnCount ) ::dbtools::throwInvalidIndexException(*this); } -Reference< css::io::XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< css::io::XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) { return nullptr; } -Reference< css::io::XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< css::io::XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) { return nullptr; } -sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 columnIndex ) { return bool(getValue(columnIndex)); } -sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 columnIndex ) { return getValue(columnIndex); } -Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) { return getValue(columnIndex); } -css::util::Date SAL_CALL OResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::Date SAL_CALL OResultSet::getDate( sal_Int32 columnIndex ) { return getValue(columnIndex); } -double SAL_CALL OResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +double SAL_CALL OResultSet::getDouble( sal_Int32 columnIndex ) { return getValue(columnIndex); } -float SAL_CALL OResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +float SAL_CALL OResultSet::getFloat( sal_Int32 columnIndex ) { return getValue(columnIndex); } -sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 columnIndex ) { return getValue(columnIndex); } -sal_Int32 SAL_CALL OResultSet::getRow( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSet::getRow( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -283,13 +282,13 @@ sal_Int32 SAL_CALL OResultSet::getRow( ) throw(SQLException, RuntimeException, } -sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 columnIndex ) { return getValue(columnIndex); } -Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -300,57 +299,57 @@ Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) throw(SQLEx return m_xMetaData; } -Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) { return nullptr; } -Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) { return nullptr; } -Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 /*columnIndex*/ ) { return nullptr; } -Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) { return nullptr; } -Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ ) { return getValue(columnIndex).makeAny(); } -sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex ) { return getValue(columnIndex); } -OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) { return getValue(columnIndex); } -css::util::Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) { return getValue(columnIndex); } -css::util::DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 columnIndex ) { return getValue(columnIndex); } -sal_Bool SAL_CALL OResultSet::isAfterLast( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::isAfterLast( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -359,7 +358,7 @@ sal_Bool SAL_CALL OResultSet::isAfterLast( ) throw(SQLException, RuntimeExcepti return m_nRowPos == sal_Int32(m_pFileSet->get().size()); } -sal_Bool SAL_CALL OResultSet::isFirst( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::isFirst( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -368,7 +367,7 @@ sal_Bool SAL_CALL OResultSet::isFirst( ) throw(SQLException, RuntimeException, return m_nRowPos == 0; } -sal_Bool SAL_CALL OResultSet::isLast( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::isLast( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -377,7 +376,7 @@ sal_Bool SAL_CALL OResultSet::isLast( ) throw(SQLException, RuntimeException, s return m_nRowPos == sal_Int32(m_pFileSet->get().size() - 1); } -void SAL_CALL OResultSet::beforeFirst( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::beforeFirst( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -387,7 +386,7 @@ void SAL_CALL OResultSet::beforeFirst( ) throw(SQLException, RuntimeException, previous(); } -void SAL_CALL OResultSet::afterLast( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::afterLast( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -399,13 +398,13 @@ void SAL_CALL OResultSet::afterLast( ) throw(SQLException, RuntimeException, st } -void SAL_CALL OResultSet::close( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::close( ) { dispose(); } -sal_Bool SAL_CALL OResultSet::first( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::first( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -413,7 +412,7 @@ sal_Bool SAL_CALL OResultSet::first( ) throw(SQLException, RuntimeException, st } -sal_Bool SAL_CALL OResultSet::last( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::last( ) { // here I know definitely that I stand on the last record ::osl::MutexGuard aGuard( m_aMutex ); @@ -421,28 +420,28 @@ sal_Bool SAL_CALL OResultSet::last( ) throw(SQLException, RuntimeException, std return m_pTable.is() && m_aSkipDeletedSet.skipDeleted(IResultSetHelper::LAST,1,true); } -sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); return m_pTable.is() && m_aSkipDeletedSet.skipDeleted(IResultSetHelper::ABSOLUTE1,row,true); } -sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); return m_pTable.is() && m_aSkipDeletedSet.skipDeleted(IResultSetHelper::RELATIVE1,row,true); } -sal_Bool SAL_CALL OResultSet::previous( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::previous( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); return m_pTable.is() && m_aSkipDeletedSet.skipDeleted(IResultSetHelper::PRIOR,0,true); } -Reference< XInterface > SAL_CALL OResultSet::getStatement( ) throw(SQLException, RuntimeException, std::exception) +Reference< XInterface > SAL_CALL OResultSet::getStatement( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -452,7 +451,7 @@ Reference< XInterface > SAL_CALL OResultSet::getStatement( ) throw(SQLException } -sal_Bool SAL_CALL OResultSet::rowDeleted( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::rowDeleted( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -461,7 +460,7 @@ sal_Bool SAL_CALL OResultSet::rowDeleted( ) throw(SQLException, RuntimeExceptio return m_bRowDeleted; } -sal_Bool SAL_CALL OResultSet::rowInserted( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::rowInserted( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -469,7 +468,7 @@ sal_Bool SAL_CALL OResultSet::rowInserted( ) throw(SQLException, RuntimeExcepti return m_bRowInserted; } -sal_Bool SAL_CALL OResultSet::rowUpdated( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::rowUpdated( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -479,7 +478,7 @@ sal_Bool SAL_CALL OResultSet::rowUpdated( ) throw(SQLException, RuntimeExceptio } -sal_Bool SAL_CALL OResultSet::isBeforeFirst( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::isBeforeFirst( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -488,7 +487,7 @@ sal_Bool SAL_CALL OResultSet::isBeforeFirst( ) throw(SQLException, RuntimeExcep return m_nRowPos == -1; } -sal_Bool SAL_CALL OResultSet::next( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::next( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -497,7 +496,7 @@ sal_Bool SAL_CALL OResultSet::next( ) throw(SQLException, RuntimeException, std } -sal_Bool SAL_CALL OResultSet::wasNull( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::wasNull( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -506,20 +505,20 @@ sal_Bool SAL_CALL OResultSet::wasNull( ) throw(SQLException, RuntimeException, } -void SAL_CALL OResultSet::cancel( ) throw(RuntimeException, std::exception) +void SAL_CALL OResultSet::cancel( ) { } -void SAL_CALL OResultSet::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::clearWarnings( ) { } -Any SAL_CALL OResultSet::getWarnings( ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OResultSet::getWarnings( ) { return Any(); } -void SAL_CALL OResultSet::insertRow( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::insertRow( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -543,7 +542,7 @@ void SAL_CALL OResultSet::insertRow( ) throw(SQLException, RuntimeException, st } } -void SAL_CALL OResultSet::updateRow( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateRow( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -557,7 +556,7 @@ void SAL_CALL OResultSet::updateRow( ) throw(SQLException, RuntimeException, st clearInsertRow(); } -void SAL_CALL OResultSet::deleteRow() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::deleteRow() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -579,7 +578,7 @@ void SAL_CALL OResultSet::deleteRow() throw(SQLException, RuntimeException, std: } } -void SAL_CALL OResultSet::cancelRowUpdates( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::cancelRowUpdates( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -602,7 +601,7 @@ void SAL_CALL OResultSet::cancelRowUpdates( ) throw(SQLException, RuntimeExcept } -void SAL_CALL OResultSet::moveToInsertRow( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::moveToInsertRow( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -621,11 +620,11 @@ void SAL_CALL OResultSet::moveToInsertRow( ) throw(SQLException, RuntimeExcepti } -void SAL_CALL OResultSet::moveToCurrentRow( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::moveToCurrentRow( ) { } -void OResultSet::updateValue(sal_Int32 columnIndex ,const ORowSetValue& x) throw(SQLException, RuntimeException) +void OResultSet::updateValue(sal_Int32 columnIndex ,const ORowSetValue& x) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -638,79 +637,79 @@ void OResultSet::updateValue(sal_Int32 columnIndex ,const ORowSetValue& x) throw } -void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) { ORowSetValue aEmpty; updateValue(columnIndex,aEmpty); } -void SAL_CALL OResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) { updateValue(columnIndex, static_cast(x)); } -void SAL_CALL OResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateLong( sal_Int32 /*columnIndex*/, sal_Int64 /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateLong( sal_Int32 /*columnIndex*/, sal_Int64 /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRowUpdate::updateLong", *this ); } -void SAL_CALL OResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateFloat( sal_Int32 columnIndex, float x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateDouble( sal_Int32 columnIndex, double x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateBytes( sal_Int32 columnIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateBytes( sal_Int32 columnIndex, const Sequence< sal_Int8 >& x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const css::util::Date& x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const css::util::Time& x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -723,25 +722,25 @@ void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Refer updateValue(columnIndex,aSeq); } -void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) { updateBinaryStream(columnIndex,x,length); } -void SAL_CALL OResultSet::refreshRow( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::refreshRow( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) { if (!::dbtools::implUpdateObject(this, columnIndex, x)) throw SQLException(); } -void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 /*scale*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 /*scale*/ ) { if (!::dbtools::implUpdateObject(this, columnIndex, x)) throw SQLException(); @@ -1420,7 +1419,7 @@ Sequence< sal_Int8 > OResultSet::getUnoTunnelImplementationId() // css::lang::XUnoTunnel -sal_Int64 OResultSet::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception) +sal_Int64 OResultSet::getSomething( const Sequence< sal_Int8 > & rId ) { return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) ? reinterpret_cast< sal_Int64 >( this ) @@ -1555,7 +1554,7 @@ void SAL_CALL OResultSet::release() throw() OResultSet_BASE::release(); } -Reference< css::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo( ) throw(RuntimeException, std::exception) +Reference< css::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } @@ -1615,7 +1614,7 @@ bool OResultSet::isRowDeleted() const return m_aRow->isDeleted(); } -void SAL_CALL OResultSet::disposing( const EventObject& Source ) throw (RuntimeException, std::exception) +void SAL_CALL OResultSet::disposing( const EventObject& Source ) { Reference xProp = m_pTable.get(); if(m_pTable.is() && Source.Source == xProp) diff --git a/connectivity/source/drivers/file/FResultSetMetaData.cxx b/connectivity/source/drivers/file/FResultSetMetaData.cxx index d1c612d50e70..070cd4492bc1 100644 --- a/connectivity/source/drivers/file/FResultSetMetaData.cxx +++ b/connectivity/source/drivers/file/FResultSetMetaData.cxx @@ -49,44 +49,44 @@ OResultSetMetaData::~OResultSetMetaData() m_xColumns = nullptr; } -void OResultSetMetaData::checkColumnIndex(sal_Int32 column) throw(SQLException, RuntimeException) +void OResultSetMetaData::checkColumnIndex(sal_Int32 column) { if(column <= 0 || column > (sal_Int32)(sal_Int32)m_xColumns->get().size()) throwInvalidIndexException(*this); } -sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) { return getPrecision(column); } -sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 column ) { checkColumnIndex(column); return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPE))); } -sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount( ) { return (m_xColumns->get()).size(); } -sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 /*column*/ ) { return false; } -OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) { return OUString(); } -OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) { checkColumnIndex(column); @@ -94,77 +94,77 @@ OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQ return aName.hasValue() ? getString(aName) : getString((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME))); } -OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 /*column*/ ) { return m_aTableName; } -OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) { return OUString(); } -OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) { checkColumnIndex(column); return getString((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))); } -OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) { return getColumnName(column); } -OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) { return OUString(); } -sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) { checkColumnIndex(column); return getBOOL((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY))); } -sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 /*setCatalogcolumn*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 /*setCatalogcolumn*/ ) { return false; } -sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 /*column*/ ) { return true; } -sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) { checkColumnIndex(column); return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))); } -sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) { checkColumnIndex(column); return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))); } -sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) { checkColumnIndex(column); return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE))); } -sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 /*column*/ ) { return true; } -sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) { checkColumnIndex(column); return m_pTable->isReadOnly() || ( @@ -173,12 +173,12 @@ sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLEx } -sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) { return !isReadOnly(column); } -sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) { return !isReadOnly(column); } diff --git a/connectivity/source/drivers/file/FStatement.cxx b/connectivity/source/drivers/file/FStatement.cxx index 0bd256484117..6d91496c378f 100644 --- a/connectivity/source/drivers/file/FStatement.cxx +++ b/connectivity/source/drivers/file/FStatement.cxx @@ -143,13 +143,13 @@ void SAL_CALL OStatement_BASE2::release() throw() release_ChildImpl(); } -Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OStatement_Base::queryInterface( const Type & rType ) { const Any aRet = OStatement_BASE::queryInterface(rType); return aRet.hasValue() ? aRet : OPropertySetHelper::queryInterface(rType); } -Sequence< Type > SAL_CALL OStatement_Base::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL OStatement_Base::getTypes( ) { ::cppu::OTypeCollection aTypes( cppu::UnoType::get(), cppu::UnoType::get(), @@ -159,11 +159,11 @@ Sequence< Type > SAL_CALL OStatement_Base::getTypes( ) throw(RuntimeException, } -void SAL_CALL OStatement_Base::cancel( ) throw(RuntimeException, std::exception) +void SAL_CALL OStatement_Base::cancel( ) { } -void SAL_CALL OStatement_Base::close() throw (SQLException, RuntimeException, std::exception) +void SAL_CALL OStatement_Base::close() { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -172,7 +172,7 @@ void SAL_CALL OStatement_Base::close() throw (SQLException, RuntimeException, st dispose(); } -void OStatement_Base::closeResultSet() throw (SQLException, RuntimeException, std::exception) +void OStatement_Base::closeResultSet() { SAL_INFO( "connectivity.drivers", "file Ocke.Janssen@sun.com OStatement_Base::clearMyResultSet " ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -192,7 +192,7 @@ void OStatement_Base::closeResultSet() throw (SQLException, RuntimeException, st m_xResultSet.clear(); } -Any SAL_CALL OStatement_Base::getWarnings( ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OStatement_Base::getWarnings( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -200,7 +200,7 @@ Any SAL_CALL OStatement_Base::getWarnings( ) throw(SQLException, RuntimeExcepti return makeAny(m_aLastWarning); } -void SAL_CALL OStatement_Base::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OStatement_Base::clearWarnings( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -239,7 +239,7 @@ void SAL_CALL OStatement::release() throw() } -sal_Bool SAL_CALL OStatement::execute( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OStatement::execute( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -249,7 +249,7 @@ sal_Bool SAL_CALL OStatement::execute( const OUString& sql ) throw(SQLException, } -Reference< XResultSet > SAL_CALL OStatement::executeQuery( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL OStatement::executeQuery( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -266,12 +266,12 @@ Reference< XResultSet > SAL_CALL OStatement::executeQuery( const OUString& sql ) return xRS; } -Reference< XConnection > SAL_CALL OStatement::getConnection( ) throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > SAL_CALL OStatement::getConnection( ) { return Reference< XConnection >(m_pConnection.get()); } -sal_Int32 SAL_CALL OStatement::executeUpdate( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OStatement::executeUpdate( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -297,12 +297,12 @@ void SAL_CALL OStatement_Base::disposing() OStatement_BASE::disposing(); } -Reference< css::beans::XPropertySetInfo > SAL_CALL OStatement_Base::getPropertySetInfo( ) throw(RuntimeException, std::exception) +Reference< css::beans::XPropertySetInfo > SAL_CALL OStatement_Base::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } -Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OStatement::queryInterface( const Type & rType ) { Any aRet = OStatement_XStatement::queryInterface( rType); return aRet.hasValue() ? aRet : OStatement_BASE2::queryInterface( rType); @@ -369,7 +369,7 @@ void OStatement_Base::setOrderbyColumn( OSQLParseNode* pColumnRef, m_aOrderbyAscending.push_back((SQL_ISTOKEN(pAscendingDescending,DESC)) ? TAscendingOrder::DESC : TAscendingOrder::ASC); } -void OStatement_Base::construct(const OUString& sql) throw(SQLException, RuntimeException, std::exception) +void OStatement_Base::construct(const OUString& sql) { OUString aErr; m_pParseTree = m_aParser.parseTree(aErr,sql); diff --git a/connectivity/source/drivers/file/FTable.cxx b/connectivity/source/drivers/file/FTable.cxx index 88ffe4fe7e84..d97707183cac 100644 --- a/connectivity/source/drivers/file/FTable.cxx +++ b/connectivity/source/drivers/file/FTable.cxx @@ -103,7 +103,7 @@ void OFileTable::refreshIndexes() { } -Any SAL_CALL OFileTable::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OFileTable::queryInterface( const Type & rType ) { if( rType == cppu::UnoType::get()|| rType == cppu::UnoType::get()|| @@ -141,7 +141,7 @@ Sequence< sal_Int8 > OFileTable::getUnoTunnelImplementationId() // css::lang::XUnoTunnel -sal_Int64 OFileTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception) +sal_Int64 OFileTable::getSomething( const Sequence< sal_Int8 > & rId ) { return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) ? reinterpret_cast< sal_Int64 >( this ) diff --git a/connectivity/source/drivers/file/FTables.cxx b/connectivity/source/drivers/file/FTables.cxx index d1402b2c3cd9..4858817601d9 100644 --- a/connectivity/source/drivers/file/FTables.cxx +++ b/connectivity/source/drivers/file/FTables.cxx @@ -40,7 +40,7 @@ sdbcx::ObjectType OTables::createObject(const OUString& /*_rName*/) return sdbcx::ObjectType(); } -void OTables::impl_refresh( ) throw(RuntimeException) +void OTables::impl_refresh( ) { static_cast(m_rParent).refreshTables(); } @@ -51,7 +51,7 @@ m_xMetaData.clear(); OCollection::disposing(); } -Any SAL_CALL OTables::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OTables::queryInterface( const Type & rType ) { if( rType == cppu::UnoType::get()|| rType == cppu::UnoType::get()|| diff --git a/connectivity/source/drivers/file/fcomp.cxx b/connectivity/source/drivers/file/fcomp.cxx index 018b57e4596f..befd56103e32 100644 --- a/connectivity/source/drivers/file/fcomp.cxx +++ b/connectivity/source/drivers/file/fcomp.cxx @@ -221,7 +221,7 @@ OOperand* OPredicateCompiler::execute(OSQLParseNode* pPredicateNode) } -void OPredicateCompiler::execute_COMPARE(OSQLParseNode* pPredicateNode) throw(SQLException, RuntimeException) +void OPredicateCompiler::execute_COMPARE(OSQLParseNode* pPredicateNode) { DBG_ASSERT(pPredicateNode->count() == 3,"OFILECursor: Fehler im Parse Tree"); @@ -267,7 +267,7 @@ void OPredicateCompiler::execute_COMPARE(OSQLParseNode* pPredicateNode) throw(S } -void OPredicateCompiler::execute_LIKE(OSQLParseNode* pPredicateNode) throw(SQLException, RuntimeException) +void OPredicateCompiler::execute_LIKE(OSQLParseNode* pPredicateNode) { DBG_ASSERT(pPredicateNode->count() == 2,"OFILECursor: Fehler im Parse Tree"); const OSQLParseNode* pPart2 = pPredicateNode->getChild(1); @@ -315,7 +315,7 @@ void OPredicateCompiler::execute_LIKE(OSQLParseNode* pPredicateNode) throw(SQLEx m_aCodeList.push_back(pOperator); } -void OPredicateCompiler::execute_BETWEEN(OSQLParseNode* pPredicateNode) throw(SQLException, RuntimeException, std::exception) +void OPredicateCompiler::execute_BETWEEN(OSQLParseNode* pPredicateNode) { DBG_ASSERT(pPredicateNode->count() == 2,"OFILECursor: Fehler im Parse Tree"); @@ -392,7 +392,7 @@ void OPredicateCompiler::execute_BETWEEN(OSQLParseNode* pPredicateNode) throw(SQ m_aCodeList.push_back(pBoolOp); } -void OPredicateCompiler::execute_ISNULL(OSQLParseNode* pPredicateNode) throw(SQLException, RuntimeException) +void OPredicateCompiler::execute_ISNULL(OSQLParseNode* pPredicateNode) { DBG_ASSERT(pPredicateNode->count() == 2,"OFILECursor: Fehler im Parse Tree"); const OSQLParseNode* pPart2 = pPredicateNode->getChild(1); @@ -410,7 +410,7 @@ void OPredicateCompiler::execute_ISNULL(OSQLParseNode* pPredicateNode) throw(SQL m_aCodeList.push_back(pOperator); } -OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode) throw(SQLException, RuntimeException, std::exception) +OOperand* OPredicateCompiler::execute_Operand(OSQLParseNode* pPredicateNode) { OOperand* pOperand = nullptr; @@ -589,7 +589,7 @@ void OPredicateInterpreter::evaluateSelection(OCodeList& rCodeList,ORowSetValueD delete pOperand; } -void OPredicateCompiler::execute_Fold(OSQLParseNode* pPredicateNode) throw(SQLException, RuntimeException) +void OPredicateCompiler::execute_Fold(OSQLParseNode* pPredicateNode) { DBG_ASSERT(pPredicateNode->count() >= 4,"OFILECursor: Fehler im Parse Tree"); @@ -605,7 +605,7 @@ void OPredicateCompiler::execute_Fold(OSQLParseNode* pPredicateNode) throw(SQL m_aCodeList.push_back(pOperator); } -void OPredicateCompiler::executeFunction(OSQLParseNode* pPredicateNode) throw(SQLException, RuntimeException) +void OPredicateCompiler::executeFunction(OSQLParseNode* pPredicateNode) { OOperator* pOperator = nullptr; diff --git a/connectivity/source/drivers/firebird/Blob.cxx b/connectivity/source/drivers/firebird/Blob.cxx index 2c6b95261c31..0677388f1610 100644 --- a/connectivity/source/drivers/firebird/Blob.cxx +++ b/connectivity/source/drivers/firebird/Blob.cxx @@ -45,7 +45,6 @@ Blob::Blob(isc_db_handle* pDatabaseHandle, } void Blob::ensureBlobIsOpened() - throw(SQLException) { MutexGuard aGuard(m_aMutex); @@ -94,7 +93,6 @@ void Blob::ensureBlobIsOpened() } void Blob::closeBlob() - throw (SQLException) { MutexGuard aGuard(m_aMutex); @@ -132,7 +130,6 @@ void SAL_CALL Blob::disposing() } sal_Int64 SAL_CALL Blob::length() - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); checkDisposed(Blob_BASE::rBHelper.bDisposed); @@ -143,7 +140,6 @@ sal_Int64 SAL_CALL Blob::length() uno::Sequence< sal_Int8 > SAL_CALL Blob::getBytes(sal_Int64 nPosition, sal_Int32 nBytes) - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); checkDisposed(Blob_BASE::rBHelper.bDisposed); @@ -172,14 +168,12 @@ uno::Sequence< sal_Int8 > SAL_CALL Blob::getBytes(sal_Int64 nPosition, } uno::Reference< XInputStream > SAL_CALL Blob::getBinaryStream() - throw(SQLException, RuntimeException, std::exception) { return this; } sal_Int64 SAL_CALL Blob::position(const uno::Sequence< sal_Int8 >& /*rPattern*/, sal_Int64 /*nStart*/) - throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedSQLException("Blob::position", *this); return 0; @@ -187,7 +181,6 @@ sal_Int64 SAL_CALL Blob::position(const uno::Sequence< sal_Int8 >& /*rPattern*/ sal_Int64 SAL_CALL Blob::positionOfBlob(const uno::Reference< XBlob >& /*rPattern*/, sal_Int64 /*aStart*/) - throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedSQLException("Blob::positionOfBlob", *this); return 0; @@ -197,7 +190,6 @@ sal_Int64 SAL_CALL Blob::positionOfBlob(const uno::Reference< XBlob >& /*rPatte sal_Int32 SAL_CALL Blob::readBytes(uno::Sequence< sal_Int8 >& rDataOut, sal_Int32 nBytes) - throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); @@ -263,7 +255,6 @@ sal_Int32 SAL_CALL Blob::readBytes(uno::Sequence< sal_Int8 >& rDataOut, sal_Int32 SAL_CALL Blob::readSomeBytes(uno::Sequence< sal_Int8 >& rDataOut, sal_Int32 nMaximumBytes) - throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { // We don't have any way of verifying how many bytes are immediately available, // hence we just pass through direct to readBytes @@ -272,7 +263,6 @@ sal_Int32 SAL_CALL Blob::readSomeBytes(uno::Sequence< sal_Int8 >& rDataOut, } void SAL_CALL Blob::skipBytes(sal_Int32 nBytesToSkip) - throw (NotConnectedException, BufferSizeExceededException, IOException, RuntimeException, std::exception) { // There is no way of directly skipping, hence we have to pretend to skip // by reading & discarding the data. @@ -281,7 +271,6 @@ void SAL_CALL Blob::skipBytes(sal_Int32 nBytesToSkip) } sal_Int32 SAL_CALL Blob::available() - throw (NotConnectedException, IOException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); @@ -314,7 +303,6 @@ sal_Int32 SAL_CALL Blob::available() } void SAL_CALL Blob::closeInput() - throw(NotConnectedException, IOException, RuntimeException, std::exception) { try { diff --git a/connectivity/source/drivers/firebird/Blob.hxx b/connectivity/source/drivers/firebird/Blob.hxx index c8fd8c79e6f7..eb8e282bf911 100644 --- a/connectivity/source/drivers/firebird/Blob.hxx +++ b/connectivity/source/drivers/firebird/Blob.hxx @@ -46,16 +46,14 @@ namespace connectivity ISC_STATUS_ARRAY m_statusVector; /// @throws css::sdbc::SQLException - void ensureBlobIsOpened() - throw(css::sdbc::SQLException); + void ensureBlobIsOpened(); /** * Closes the blob and cleans up resources -- can be used to reset * the blob if we e.g. want to read from the beginning again. * * @throws css::sdbc::SQLException */ - void closeBlob() - throw(css::sdbc::SQLException); + void closeBlob(); public: Blob(isc_db_handle* pDatabaseHandle, @@ -64,59 +62,31 @@ namespace connectivity // ---- XBlob ---------------------------------------------------- virtual sal_Int64 SAL_CALL - length() - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + length() override; virtual css::uno::Sequence< sal_Int8 > SAL_CALL - getBytes(sal_Int64 aPosition, sal_Int32 aLength) - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getBytes(sal_Int64 aPosition, sal_Int32 aLength) override; virtual css::uno::Reference< css::io::XInputStream > SAL_CALL - getBinaryStream() - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getBinaryStream() override; virtual sal_Int64 SAL_CALL position(const css::uno::Sequence< sal_Int8 >& rPattern, - sal_Int64 aStart) - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + sal_Int64 aStart) override; virtual sal_Int64 SAL_CALL positionOfBlob(const css::uno::Reference< css::sdbc::XBlob >& rPattern, - sal_Int64 aStart) - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + sal_Int64 aStart) override; // ---- XInputStream ---------------------------------------------- virtual sal_Int32 SAL_CALL readBytes(css::uno::Sequence< sal_Int8 >& rDataOut, - sal_Int32 nBytes) - throw(css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception) override; + sal_Int32 nBytes) override; virtual sal_Int32 SAL_CALL readSomeBytes(css::uno::Sequence< sal_Int8 >& rDataOut, - sal_Int32 nMaximumBytes) - throw(css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception) override; + sal_Int32 nMaximumBytes) override; virtual void SAL_CALL - skipBytes(sal_Int32 nBytes) - throw(css::io::NotConnectedException, - css::io::BufferSizeExceededException, - css::io::IOException, - css::uno::RuntimeException, std::exception) override; + skipBytes(sal_Int32 nBytes) override; virtual sal_Int32 SAL_CALL - available() - throw(css::io::NotConnectedException, - css::io::IOException, - css::uno::RuntimeException, std::exception) override; + available() override; virtual void SAL_CALL - closeInput() - throw(css::io::NotConnectedException, - css::io::IOException, - css::uno::RuntimeException, std::exception) override; + closeInput() override; // ---- OComponentHelper ------------------------------------------ virtual void SAL_CALL disposing() override; diff --git a/connectivity/source/drivers/firebird/Clob.cxx b/connectivity/source/drivers/firebird/Clob.cxx index 83d95797d4d9..4f70a000a242 100644 --- a/connectivity/source/drivers/firebird/Clob.cxx +++ b/connectivity/source/drivers/firebird/Clob.cxx @@ -40,7 +40,6 @@ void SAL_CALL Clob::disposing() } sal_Int64 SAL_CALL Clob::length() - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); checkDisposed(Clob_BASE::rBHelper.bDisposed); @@ -56,7 +55,6 @@ sal_Int64 SAL_CALL Clob::length() OUString SAL_CALL Clob::getSubString(sal_Int64 nPosition, sal_Int32 nLength) - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); checkDisposed(Clob_BASE::rBHelper.bDisposed); @@ -76,7 +74,6 @@ OUString SAL_CALL Clob::getSubString(sal_Int64 nPosition, } uno::Reference< XInputStream > SAL_CALL Clob::getCharacterStream() - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); checkDisposed(Clob_BASE::rBHelper.bDisposed); @@ -86,7 +83,6 @@ uno::Reference< XInputStream > SAL_CALL Clob::getCharacterStream() sal_Int64 SAL_CALL Clob::position(const OUString& /*rPattern*/, sal_Int32 /*nStart*/) - throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedSQLException("Clob::position", *this); return 0; @@ -94,7 +90,6 @@ sal_Int64 SAL_CALL Clob::position(const OUString& /*rPattern*/, sal_Int64 SAL_CALL Clob::positionOfClob(const Reference & /*rPattern*/, sal_Int64 /*aStart*/) - throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedSQLException("Blob::positionOfBlob", *this); return 0; diff --git a/connectivity/source/drivers/firebird/Clob.hxx b/connectivity/source/drivers/firebird/Clob.hxx index dfa40dedd484..b71bec19fa51 100644 --- a/connectivity/source/drivers/firebird/Clob.hxx +++ b/connectivity/source/drivers/firebird/Clob.hxx @@ -45,27 +45,17 @@ namespace connectivity // ---- XClob ---------------------------------------------------- virtual sal_Int64 SAL_CALL - length() - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + length() override; virtual ::rtl::OUString SAL_CALL - getSubString(sal_Int64 aPosition, sal_Int32 aLength) - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getSubString(sal_Int64 aPosition, sal_Int32 aLength) override; virtual css::uno::Reference< css::io::XInputStream > SAL_CALL - getCharacterStream() - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getCharacterStream() override; virtual sal_Int64 SAL_CALL position(const ::rtl::OUString& rPattern, - sal_Int32 aStart) - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + sal_Int32 aStart) override; virtual sal_Int64 SAL_CALL positionOfClob(const ::css::uno::Reference< ::css::sdbc::XClob >& rPattern, - sal_Int64 aStart) - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + sal_Int64 aStart) override; // ---- OComponentHelper ------------------------------------------ virtual void SAL_CALL disposing() override; }; diff --git a/connectivity/source/drivers/firebird/Column.cxx b/connectivity/source/drivers/firebird/Column.cxx index 38c367cfcc43..78ea2534e1fc 100644 --- a/connectivity/source/drivers/firebird/Column.cxx +++ b/connectivity/source/drivers/firebird/Column.cxx @@ -45,7 +45,7 @@ void Column::construct() return *Column_PROP::getArrayHelper(isNew() ? 1 : 0); } -css::uno::Sequence< OUString > SAL_CALL Column::getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) +css::uno::Sequence< OUString > SAL_CALL Column::getSupportedServiceNames( ) { css::uno::Sequence< OUString > aSupported { "com.sun.star.sdbc.Firebird" }; diff --git a/connectivity/source/drivers/firebird/Column.hxx b/connectivity/source/drivers/firebird/Column.hxx index 0b1ea67c1544..33d49516b6d7 100644 --- a/connectivity/source/drivers/firebird/Column.hxx +++ b/connectivity/source/drivers/firebird/Column.hxx @@ -28,7 +28,7 @@ namespace connectivity public: Column(); virtual void construct() override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; }; } } diff --git a/connectivity/source/drivers/firebird/Connection.cxx b/connectivity/source/drivers/firebird/Connection.cxx index 54ee5efdd7c9..7c39219943ee 100644 --- a/connectivity/source/drivers/firebird/Connection.cxx +++ b/connectivity/source/drivers/firebird/Connection.cxx @@ -145,7 +145,6 @@ struct ConnectionGuard }; void Connection::construct(const ::rtl::OUString& url, const Sequence< PropertyValue >& info) - throw (SQLException, RuntimeException, std::exception) { ConnectionGuard aGuard(m_refCount); @@ -360,7 +359,6 @@ IMPLEMENT_SERVICE_INFO(Connection, "com.sun.star.sdbc.drivers.firebird.Connectio "com.sun.star.sdbc.Connection") Reference< XBlob> Connection::createBlob(ISC_QUAD* pBlobId) - throw(SQLException, RuntimeException) { MutexGuard aGuard(m_aMutex); checkDisposed(Connection_BASE::rBHelper.bDisposed); @@ -374,7 +372,6 @@ Reference< XBlob> Connection::createBlob(ISC_QUAD* pBlobId) } Reference< XClob> Connection::createClob(ISC_QUAD* pBlobId) - throw(SQLException, RuntimeException) { MutexGuard aGuard(m_aMutex); checkDisposed(Connection_BASE::rBHelper.bDisposed); @@ -390,7 +387,6 @@ Reference< XClob> Connection::createClob(ISC_QUAD* pBlobId) //----- XConnection ---------------------------------------------------------- Reference< XStatement > SAL_CALL Connection::createStatement( ) - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); checkDisposed(Connection_BASE::rBHelper.bDisposed); @@ -432,7 +428,6 @@ OUString Connection::transformPreparedStatement(const OUString& _sSQL) Reference< XPreparedStatement > SAL_CALL Connection::prepareStatement( const OUString& _sSql) - throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.firebird", "prepareStatement() " "called with sql: " << _sSql); @@ -452,7 +447,7 @@ Reference< XPreparedStatement > SAL_CALL Connection::prepareStatement( } Reference< XPreparedStatement > SAL_CALL Connection::prepareCall( - const OUString& _sSql ) throw(SQLException, RuntimeException, std::exception) + const OUString& _sSql ) { SAL_INFO("connectivity.firebird", "prepareCall(). " "_sSql: " << _sSql); @@ -467,7 +462,6 @@ Reference< XPreparedStatement > SAL_CALL Connection::prepareCall( } OUString SAL_CALL Connection::nativeSQL( const OUString& _sSql ) - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); // We do not need to adapt the SQL for Firebird atm. @@ -475,7 +469,6 @@ OUString SAL_CALL Connection::nativeSQL( const OUString& _sSql ) } void SAL_CALL Connection::setAutoCommit( sal_Bool autoCommit ) - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); checkDisposed(Connection_BASE::rBHelper.bDisposed); @@ -488,7 +481,7 @@ void SAL_CALL Connection::setAutoCommit( sal_Bool autoCommit ) } } -sal_Bool SAL_CALL Connection::getAutoCommit() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL Connection::getAutoCommit() { MutexGuard aGuard( m_aMutex ); checkDisposed(Connection_BASE::rBHelper.bDisposed); @@ -497,7 +490,6 @@ sal_Bool SAL_CALL Connection::getAutoCommit() throw(SQLException, RuntimeExcepti } void Connection::setupTransaction() - throw (SQLException) { MutexGuard aGuard( m_aMutex ); ISC_STATUS status_vector[20]; @@ -555,7 +547,6 @@ void Connection::setupTransaction() } isc_tr_handle& Connection::getTransaction() - throw (SQLException) { MutexGuard aGuard( m_aMutex ); if (!m_aTransactionHandle) @@ -565,7 +556,7 @@ isc_tr_handle& Connection::getTransaction() return m_aTransactionHandle; } -void SAL_CALL Connection::commit() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL Connection::commit() { MutexGuard aGuard( m_aMutex ); checkDisposed(Connection_BASE::rBHelper.bDisposed); @@ -720,7 +711,7 @@ void Connection::runBackupService(const short nAction) } -void SAL_CALL Connection::rollback() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL Connection::rollback() { MutexGuard aGuard( m_aMutex ); checkDisposed(Connection_BASE::rBHelper.bDisposed); @@ -733,7 +724,7 @@ void SAL_CALL Connection::rollback() throw(SQLException, RuntimeException, std:: } } -sal_Bool SAL_CALL Connection::isClosed( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL Connection::isClosed( ) { MutexGuard aGuard( m_aMutex ); @@ -741,7 +732,7 @@ sal_Bool SAL_CALL Connection::isClosed( ) throw(SQLException, RuntimeException, return Connection_BASE::rBHelper.bDisposed; } -Reference< XDatabaseMetaData > SAL_CALL Connection::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XDatabaseMetaData > SAL_CALL Connection::getMetaData( ) { MutexGuard aGuard( m_aMutex ); checkDisposed(Connection_BASE::rBHelper.bDisposed); @@ -759,7 +750,6 @@ Reference< XDatabaseMetaData > SAL_CALL Connection::getMetaData( ) throw(SQLExc } void SAL_CALL Connection::setReadOnly(sal_Bool readOnly) - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); checkDisposed(Connection_BASE::rBHelper.bDisposed); @@ -768,7 +758,7 @@ void SAL_CALL Connection::setReadOnly(sal_Bool readOnly) setupTransaction(); } -sal_Bool SAL_CALL Connection::isReadOnly() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL Connection::isReadOnly() { MutexGuard aGuard( m_aMutex ); checkDisposed(Connection_BASE::rBHelper.bDisposed); @@ -777,19 +767,17 @@ sal_Bool SAL_CALL Connection::isReadOnly() throw(SQLException, RuntimeException, } void SAL_CALL Connection::setCatalog(const OUString& /*catalog*/) - throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedSQLException("setCatalog", *this); } OUString SAL_CALL Connection::getCatalog() - throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedSQLException("getCatalog", *this); return OUString(); } -void SAL_CALL Connection::setTransactionIsolation( sal_Int32 level ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL Connection::setTransactionIsolation( sal_Int32 level ) { MutexGuard aGuard( m_aMutex ); checkDisposed(Connection_BASE::rBHelper.bDisposed); @@ -798,7 +786,7 @@ void SAL_CALL Connection::setTransactionIsolation( sal_Int32 level ) throw(SQLEx setupTransaction(); } -sal_Int32 SAL_CALL Connection::getTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL Connection::getTransactionIsolation( ) { MutexGuard aGuard( m_aMutex ); checkDisposed(Connection_BASE::rBHelper.bDisposed); @@ -806,21 +794,20 @@ sal_Int32 SAL_CALL Connection::getTransactionIsolation( ) throw(SQLException, R return m_aTransactionIsolation; } -Reference< XNameAccess > SAL_CALL Connection::getTypeMap() throw(SQLException, RuntimeException, std::exception) +Reference< XNameAccess > SAL_CALL Connection::getTypeMap() { ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::getTypeMap", *this ); return nullptr; } void SAL_CALL Connection::setTypeMap(const Reference< XNameAccess >& typeMap) - throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setTypeMap", *this ); (void) typeMap; } //----- XCloseable ----------------------------------------------------------- -void SAL_CALL Connection::close( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL Connection::close( ) { // we just dispose us { @@ -832,20 +819,19 @@ void SAL_CALL Connection::close( ) throw(SQLException, RuntimeException, std::e } // XWarningsSupplier -Any SAL_CALL Connection::getWarnings( ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL Connection::getWarnings( ) { // when you collected some warnings -> return it return Any(); } -void SAL_CALL Connection::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL Connection::clearWarnings( ) { // you should clear your collected warnings here } // XDocumentEventListener void SAL_CALL Connection::documentEventOccured( const DocumentEvent& Event ) - throw(RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); @@ -899,14 +885,13 @@ void SAL_CALL Connection::documentEventOccured( const DocumentEvent& Event ) } // XEventListener void SAL_CALL Connection::disposing(const EventObject& /*rSource*/) - throw (RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); m_xEmbeddedStorage.clear(); } -void Connection::buildTypeInfo() throw( SQLException) +void Connection::buildTypeInfo() { MutexGuard aGuard( m_aMutex ); diff --git a/connectivity/source/drivers/firebird/Connection.hxx b/connectivity/source/drivers/firebird/Connection.hxx index 9e8d917c4393..6c6df60beffd 100644 --- a/connectivity/source/drivers/firebird/Connection.hxx +++ b/connectivity/source/drivers/firebird/Connection.hxx @@ -157,8 +157,7 @@ namespace connectivity OWeakRefArray m_aStatements; /// @throws css::sdbc::SQLException - void buildTypeInfo() - throw (css::sdbc::SQLException); + void buildTypeInfo(); /** * Creates a new transaction with the desired parameters, if @@ -167,8 +166,7 @@ namespace connectivity * * @throws css::sdbc::SQLException */ - void setupTransaction() - throw(css::sdbc::SQLException); + void setupTransaction(); void disposeStatements(); /** transform named parameters into unnamed parameters @@ -186,17 +184,13 @@ namespace connectivity /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException void construct( const ::rtl::OUString& url, - const css::uno::Sequence< css::beans::PropertyValue >& info) - throw(css::sdbc::SQLException, - css::uno::RuntimeException, - std::exception); + const css::uno::Sequence< css::beans::PropertyValue >& info); const OUString& getConnectionURL() const {return m_sConnectionURL;} bool isEmbedded() const {return m_bIsEmbedded;} isc_db_handle& getDBHandle() {return m_aDBHandle;} /// @throws css::sdbc::SQLException - isc_tr_handle& getTransaction() - throw(css::sdbc::SQLException); + isc_tr_handle& getTransaction(); /** * Must be called anytime the underlying database is likely to have @@ -217,15 +211,11 @@ namespace connectivity * @throws css::uno::RuntimeException */ css::uno::Reference< css::sdbc::XBlob> - createBlob(ISC_QUAD* pBlobID) - throw(css::sdbc::SQLException, - css::uno::RuntimeException); + createBlob(ISC_QUAD* pBlobID); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException css::uno::Reference< css::sdbc::XClob> - createClob(ISC_QUAD* pBlobID) - throw(css::sdbc::SQLException, - css::uno::RuntimeException); + createClob(ISC_QUAD* pBlobID); /** * Create and/or connect to the sdbcx Catalog. This is completely @@ -242,33 +232,33 @@ namespace connectivity // XServiceInfo DECLARE_SERVICE_INFO(); // XConnection - virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const ::rtl::OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL nativeSQL( const ::rtl::OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getAutoCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL commit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL rollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isClosed( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCatalog( const ::rtl::OUString& catalog ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getCatalog( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const ::rtl::OUString& sql ) override; + virtual ::rtl::OUString SAL_CALL nativeSQL( const ::rtl::OUString& sql ) override; + virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) override; + virtual sal_Bool SAL_CALL getAutoCommit( ) override; + virtual void SAL_CALL commit( ) override; + virtual void SAL_CALL rollback( ) override; + virtual sal_Bool SAL_CALL isClosed( ) override; + virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) override; + virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) override; + virtual sal_Bool SAL_CALL isReadOnly( ) override; + virtual void SAL_CALL setCatalog( const ::rtl::OUString& catalog ) override; + virtual ::rtl::OUString SAL_CALL getCatalog( ) override; + virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) override; + virtual sal_Int32 SAL_CALL getTransactionIsolation( ) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) override; + virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; // XCloseable - virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) override; // XWarningsSupplier - virtual css::uno::Any SAL_CALL getWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getWarnings( ) override; + virtual void SAL_CALL clearWarnings( ) override; // XDocumentEventListener - virtual void SAL_CALL documentEventOccured( const css::document::DocumentEvent& Event ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL documentEventOccured( const css::document::DocumentEvent& Event ) override; // css.lang.XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; }; } diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx index f774438e6335..66d9783ba9cd 100644 --- a/connectivity/source/drivers/firebird/DatabaseMetaData.cxx +++ b/connectivity/source/drivers/firebird/DatabaseMetaData.cxx @@ -55,103 +55,95 @@ ODatabaseMetaData::~ODatabaseMetaData() } //----- Catalog Info -- UNSUPPORTED ------------------------------------------- -OUString SAL_CALL ODatabaseMetaData::getCatalogSeparator() throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getCatalogSeparator() { return OUString(); } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength() throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength() { return -1; } -OUString SAL_CALL ODatabaseMetaData::getCatalogTerm() throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getCatalogTerm() { return OUString(); } -sal_Bool SAL_CALL ODatabaseMetaData::isCatalogAtStart() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::isCatalogAtStart() { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInTableDefinitions() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInTableDefinitions() { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions() { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInDataManipulation( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInDataManipulation( ) { return false; } -uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs() throw(SQLException, RuntimeException, std::exception) +uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs() { OSL_FAIL("Not implemented yet!"); // TODO implement return new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eCatalogs); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls() { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions() { return false; } //----- Schema Info -- UNSUPPORTED -------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls() - throw(SQLException, RuntimeException, std::exception) { return false; } sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions() - throw(SQLException, RuntimeException, std::exception) { return false; } sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInDataManipulation() - throw(SQLException, RuntimeException, std::exception) { return false; } sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions() - throw(SQLException, RuntimeException, std::exception) { return false; } sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInTableDefinitions() - throw(SQLException, RuntimeException, std::exception) { return false; } sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength() - throw(SQLException, RuntimeException, std::exception) { return -1; } OUString SAL_CALL ODatabaseMetaData::getSchemaTerm() - throw(SQLException, RuntimeException, std::exception) { return OUString(); } uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas() - throw(SQLException, RuntimeException, std::exception) { OSL_FAIL("Not implemented yet!"); // TODO implement @@ -159,68 +151,68 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas() } //----- Max Sizes/Lengths ----------------------------------------------------- -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength() throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength() { return 32767; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize() throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize() { return 32767; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength() throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength() { return 32767; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength() throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength() { return 31; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex() throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex() { // TODO: No idea. // See: http://www.firebirdsql.org/en/firebird-technical-specifications/ return 16; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength() throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength() { return 32; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections() throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections() { return 100; // Arbitrary } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable() throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable() { // May however be smaller. // See: http://www.firebirdsql.org/en/firebird-technical-specifications/ return 32767; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength() throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength() { return 32767; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength() throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength() { return 31; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTablesInSelect( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTablesInSelect( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) { return false; } @@ -228,25 +220,22 @@ sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLExc // ---- Identifiers ----------------------------------------------------------- // Only quoted identifiers are case sensitive, unquoted are case insensitive OUString SAL_CALL ODatabaseMetaData::getIdentifierQuoteString() - throw(SQLException, RuntimeException, std::exception) { OUString aVal('"'); return aVal; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseQuotedIdentifiers( ) { return true; } sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers() - throw(SQLException, RuntimeException, std::exception) { return false; } sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseQuotedIdentifiers() - throw(SQLException, RuntimeException, std::exception) { // TODO: confirm this -- the documentation is highly ambiguous // However it seems this should be true as quoted identifiers ARE @@ -255,7 +244,6 @@ sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseQuotedIdentifiers() } sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers() - throw(SQLException, RuntimeException, std::exception) { return false; } @@ -263,80 +251,67 @@ sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers() // ---- Unquoted Identifiers ------------------------------------------------- // All unquoted identifiers are stored upper case. sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers() - throw(SQLException, RuntimeException, std::exception) { return false; } sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers() - throw(SQLException, RuntimeException, std::exception) { return false; } sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers() - throw(SQLException, RuntimeException, std::exception) { return false; } sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers() - throw(SQLException, RuntimeException, std::exception) { return true; } // ---- SQL Feature Support --------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar() - throw(SQLException, RuntimeException, std::exception) { return true; } sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar() - throw(SQLException, RuntimeException, std::exception) { return true; } sal_Bool SAL_CALL ODatabaseMetaData::supportsAlterTableWithAddColumn() - throw(SQLException, RuntimeException, std::exception) { return true; } sal_Bool SAL_CALL ODatabaseMetaData::supportsAlterTableWithDropColumn() - throw(SQLException, RuntimeException, std::exception) { return true; } sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete() - throw(SQLException, RuntimeException, std::exception) { return true; } sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate() - throw(SQLException, RuntimeException, std::exception) { return true; } sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins() - throw(SQLException, RuntimeException, std::exception) { return true; } sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate() - throw(SQLException, RuntimeException, std::exception) { return true; } sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable() - throw(SQLException, RuntimeException, std::exception) { // TODO: true if embedded, but unsure about remote server return true; @@ -344,7 +319,6 @@ sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable() sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert(sal_Int32 fromType, sal_Int32 toType) - throw(SQLException, RuntimeException, std::exception) { (void) fromType; (void) toType; @@ -352,109 +326,95 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert(sal_Int32 fromType, } sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion() - throw(SQLException, RuntimeException, std::exception) { return false; } sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing() - throw(SQLException, RuntimeException, std::exception) { return true; } sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames() - throw(SQLException, RuntimeException, std::exception) { return true; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) { return true; } -OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) { OUString aVal; return aVal; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( ) { return false; } // ---- Data definition stuff ------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions() - throw(SQLException, RuntimeException, std::exception) { return false; } sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit() - throw(SQLException, RuntimeException, std::exception) { return true; } sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly() - throw(SQLException, RuntimeException, std::exception) { return true; } sal_Bool SAL_CALL ODatabaseMetaData:: supportsDataDefinitionAndDataManipulationTransactions() - throw(SQLException, RuntimeException, std::exception) { return false; } //----- Transaction Support -------------------------------------------------- sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions() - throw(SQLException, RuntimeException, std::exception) { return true; } sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback() - throw(SQLException, RuntimeException, std::exception) { return false; } sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit() - throw(SQLException, RuntimeException, std::exception) { return false; } sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit() - throw(SQLException, RuntimeException, std::exception) { return false; } sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback() - throw(SQLException, RuntimeException, std::exception) { return false; } sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions() - throw(SQLException, RuntimeException, std::exception) { return true; } sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 aLevel) - throw(SQLException, RuntimeException, std::exception) { return aLevel == TransactionIsolation::READ_UNCOMMITTED || aLevel == TransactionIsolation::READ_COMMITTED @@ -463,290 +423,288 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( } sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation() - throw(SQLException, RuntimeException, std::exception) { return TransactionIsolation::REPEATABLE_READ; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL( ) { return true; // should be supported at least } -sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility( ) { return true; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatements( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatements( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength( ) { sal_Int32 nValue = 31; // TODO: confirm return nValue; } -sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly( ) { return m_pConnection->isReadOnly(); } -sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles( ) { return m_pConnection->isEmbedded(); } -sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect( ) { // Unsure return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated( ) { // Unsure return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) { return false; } -OUString SAL_CALL ODatabaseMetaData::getURL() throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getURL() { return m_pConnection->getConnectionURL(); } -OUString SAL_CALL ODatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getUserName( ) { OUString aValue; return aValue; } -OUString SAL_CALL ODatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getDriverName( ) { OUString aValue; return aValue; } -OUString SAL_CALL ODatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getDriverVersion() { OUString aValue; return aValue; } -OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) { OUString aValue; return aValue; } -OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) { OUString aValue; return aValue; } -OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) { OUString aValue; return aValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion( ) { return 1; } -sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) { return 0; } -OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) { OUString aValue; return aValue; } -OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) { OUString aValue; return aValue; } -OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) { return OUString(); } -OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) { return OUString(); } -OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) { return OUString(); } -OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) { return OUString(); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins( ) { return false; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength( ) { return 31; } sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType(sal_Int32 setType) - throw(SQLException, RuntimeException, std::exception) { switch (setType) { @@ -760,7 +718,6 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType(sal_Int32 setType) sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 aResultSetType, sal_Int32 aConcurrency) - throw(SQLException, RuntimeException, std::exception) { if (aResultSetType == ResultSetType::FORWARD_ONLY && aConcurrency == ResultSetConcurrency::READ_ONLY) @@ -769,69 +726,67 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( return false; } -sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType ) { (void) setType; return false; } -sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType ) { (void) setType; return false; } -sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType ) { (void) setType; return false; } -sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 setType ) { (void) setType; return false; } -sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 setType ) { (void) setType; return false; } -sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 setType ) { (void) setType; return false; } -sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 setType ) { (void) setType; return false; } -sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 setType ) { (void) setType; return false; } -sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 setType ) { (void) setType; return false; } sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates() - throw(SQLException, RuntimeException, std::exception) { // No batch support in firebird return false; } uno::Reference< XConnection > SAL_CALL ODatabaseMetaData::getConnection() - throw(SQLException, RuntimeException, std::exception) { return uno::Reference(m_pConnection.get()); } @@ -841,7 +796,7 @@ uno::Reference< XConnection > SAL_CALL ODatabaseMetaData::getConnection() // of course you could implement it on your and you should do this because // the general way is more memory expensive -uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException, std::exception) +uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) { ODatabaseMetaDataResultSet* pResultSet = new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTableTypes); @@ -869,7 +824,6 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw } uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTypeInfo() - throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.firebird", "getTypeInfo()"); @@ -1077,7 +1031,6 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges( const OUString& /*sSchema*/, const OUString& sTable, const OUString& sColumnNamePattern) - throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.firebird", "getColumnPrivileges() with " "Table: " << sTable @@ -1153,7 +1106,6 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( const OUString& /*schemaPattern*/, const OUString& tableNamePattern, const OUString& columnNamePattern) - throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.firebird", "getColumns() with " "TableNamePattern: " << tableNamePattern << @@ -1343,7 +1295,6 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( const OUString& /*schemaPattern*/, const OUString& tableNamePattern, const Sequence< OUString >& types) - throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.firebird", "getTables() with " "TableNamePattern: " << tableNamePattern); @@ -1468,7 +1419,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns( const Any& catalog, const OUString& schemaPattern, - const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception) + const OUString& procedureNamePattern, const OUString& columnNamePattern ) { SAL_WARN("connectivity.firebird", "Not yet implemented"); (void) catalog; @@ -1482,7 +1433,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns( uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures( const Any& catalog, const OUString& schemaPattern, - const OUString& procedureNamePattern ) throw(SQLException, RuntimeException, std::exception) + const OUString& procedureNamePattern ) { SAL_WARN("connectivity.firebird", "Not yet implemented"); (void) catalog; @@ -1494,7 +1445,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures( } uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getVersionColumns( - const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException, std::exception) + const Any& catalog, const OUString& schema, const OUString& table ) { SAL_WARN("connectivity.firebird", "Not yet implemented"); (void) catalog; @@ -1506,7 +1457,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getVersionColumns( } uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys( - const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException, std::exception) + const Any& catalog, const OUString& schema, const OUString& table ) { // List the columns in a table which are foreign keys. This is actually // never used anywhere in the LO codebase currently. Retrieval from firebird @@ -1521,7 +1472,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys( } uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys( - const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException, std::exception) + const Any& catalog, const OUString& schema, const OUString& table ) { (void) catalog; (void) schema; @@ -1613,7 +1564,6 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys( const Any& /*aCatalog*/, const OUString& /*sSchema*/, const OUString& sTable) - throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.firebird", "getPrimaryKeys() with " "Table: " << sTable); @@ -1676,7 +1626,6 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo( const OUString& sTable, sal_Bool bIsUnique, sal_Bool bIsApproximate) - throw(SQLException, RuntimeException, std::exception) { // Apparently this method can also return a "tableIndexStatistic" // However this is only mentioned in XDatabaseMetaData.idl (whose comments @@ -1766,7 +1715,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo( uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier( const Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, - sal_Bool nullable ) throw(SQLException, RuntimeException, std::exception) + sal_Bool nullable ) { (void) catalog; (void) schema; @@ -1782,7 +1731,6 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( const Any& /*aCatalog*/, const OUString& /*sSchemaPattern*/, const OUString& sTableNamePattern) - throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.firebird", "getTablePrivileges() with " "TableNamePattern: " << sTableNamePattern); @@ -1849,7 +1797,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference( const Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const Any& foreignCatalog, - const OUString& foreignSchema, const OUString& foreignTable ) throw(SQLException, RuntimeException, std::exception) + const OUString& foreignSchema, const OUString& foreignTable ) { (void) primaryCatalog; (void) primarySchema; @@ -1862,7 +1810,7 @@ uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference( return new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eCrossReference); } -uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const Sequence< sal_Int32 >& types ) throw(SQLException, RuntimeException, std::exception) +uno::Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const Sequence< sal_Int32 >& types ) { (void) catalog; (void) schemaPattern; diff --git a/connectivity/source/drivers/firebird/DatabaseMetaData.hxx b/connectivity/source/drivers/firebird/DatabaseMetaData.hxx index fc9b1cfdb037..aeb7acab00d9 100644 --- a/connectivity/source/drivers/firebird/DatabaseMetaData.hxx +++ b/connectivity/source/drivers/firebird/DatabaseMetaData.hxx @@ -45,155 +45,155 @@ namespace connectivity // as I mentioned before this interface is really BIG // XDatabaseMetaData - virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getURL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getUserName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getDatabaseProductName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getDatabaseProductVersion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getDriverName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getDriverVersion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL usesLocalFiles( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getIdentifierQuoteString( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getSQLKeywords( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getNumericFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getStringFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getSystemFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getTimeDateFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getSearchStringEscape( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getExtraNameCharacters( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTypeConversion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsGroupBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getSchemaTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getProcedureTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getCatalogTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isCatalogAtStart( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getCatalogSeparator( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInDataManipulation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInTableDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsPositionedDelete( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsStoredProcedures( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsUnion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsUnionAll( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxConnections( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxIndexLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxRowSize( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxStatementLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxStatements( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxTablesInSelect( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern, const ::rtl::OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const css::uno::Sequence< ::rtl::OUString >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, const ::rtl::OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Int32 scope, sal_Bool nullable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const ::rtl::OUString& primarySchema, const ::rtl::OUString& primaryTable, const css::uno::Any& foreignCatalog, const ::rtl::OUString& foreignSchema, const ::rtl::OUString& foreignTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTypeInfo( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Bool unique, sal_Bool approximate ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL allProceduresAreCallable( ) override; + virtual sal_Bool SAL_CALL allTablesAreSelectable( ) override; + virtual ::rtl::OUString SAL_CALL getURL( ) override; + virtual ::rtl::OUString SAL_CALL getUserName( ) override; + virtual sal_Bool SAL_CALL isReadOnly( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedLow( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) override; + virtual ::rtl::OUString SAL_CALL getDatabaseProductName( ) override; + virtual ::rtl::OUString SAL_CALL getDatabaseProductVersion( ) override; + virtual ::rtl::OUString SAL_CALL getDriverName( ) override; + virtual ::rtl::OUString SAL_CALL getDriverVersion( ) override; + virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) override; + virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) override; + virtual sal_Bool SAL_CALL usesLocalFiles( ) override; + virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) override; + virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers( ) override; + virtual ::rtl::OUString SAL_CALL getIdentifierQuoteString( ) override; + virtual ::rtl::OUString SAL_CALL getSQLKeywords( ) override; + virtual ::rtl::OUString SAL_CALL getNumericFunctions( ) override; + virtual ::rtl::OUString SAL_CALL getStringFunctions( ) override; + virtual ::rtl::OUString SAL_CALL getSystemFunctions( ) override; + virtual ::rtl::OUString SAL_CALL getTimeDateFunctions( ) override; + virtual ::rtl::OUString SAL_CALL getSearchStringEscape( ) override; + virtual ::rtl::OUString SAL_CALL getExtraNameCharacters( ) override; + virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn( ) override; + virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn( ) override; + virtual sal_Bool SAL_CALL supportsColumnAliasing( ) override; + virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) override; + virtual sal_Bool SAL_CALL supportsTypeConversion( ) override; + virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) override; + virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) override; + virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) override; + virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) override; + virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) override; + virtual sal_Bool SAL_CALL supportsGroupBy( ) override; + virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) override; + virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) override; + virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) override; + virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) override; + virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) override; + virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) override; + virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) override; + virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) override; + virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) override; + virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) override; + virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) override; + virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) override; + virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) override; + virtual sal_Bool SAL_CALL supportsOuterJoins( ) override; + virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) override; + virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) override; + virtual ::rtl::OUString SAL_CALL getSchemaTerm( ) override; + virtual ::rtl::OUString SAL_CALL getProcedureTerm( ) override; + virtual ::rtl::OUString SAL_CALL getCatalogTerm( ) override; + virtual sal_Bool SAL_CALL isCatalogAtStart( ) override; + virtual ::rtl::OUString SAL_CALL getCatalogSeparator( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInDataManipulation( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInTableDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsPositionedDelete( ) override; + virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) override; + virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) override; + virtual sal_Bool SAL_CALL supportsStoredProcedures( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) override; + virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) override; + virtual sal_Bool SAL_CALL supportsUnion( ) override; + virtual sal_Bool SAL_CALL supportsUnionAll( ) override; + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) override; + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) override; + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) override; + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) override; + virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) override; + virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) override; + virtual sal_Int32 SAL_CALL getMaxConnections( ) override; + virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxIndexLength( ) override; + virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxRowSize( ) override; + virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) override; + virtual sal_Int32 SAL_CALL getMaxStatementLength( ) override; + virtual sal_Int32 SAL_CALL getMaxStatements( ) override; + virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxTablesInSelect( ) override; + virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) override; + virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) override; + virtual sal_Bool SAL_CALL supportsTransactions( ) override; + virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) override; + virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) override; + virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) override; + virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) override; + virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& procedureNamePattern, const ::rtl::OUString& columnNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const css::uno::Sequence< ::rtl::OUString >& types ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, const ::rtl::OUString& columnNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& tableNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Int32 scope, sal_Bool nullable ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const ::rtl::OUString& primarySchema, const ::rtl::OUString& primaryTable, const css::uno::Any& foreignCatalog, const ::rtl::OUString& foreignSchema, const ::rtl::OUString& foreignTable ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTypeInfo( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const ::rtl::OUString& schema, const ::rtl::OUString& table, sal_Bool unique, sal_Bool approximate ) override; + virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) override; + virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL supportsBatchUpdates( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const ::rtl::OUString& schemaPattern, const ::rtl::OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) override; }; } } diff --git a/connectivity/source/drivers/firebird/Driver.cxx b/connectivity/source/drivers/firebird/Driver.cxx index ff63fbe114ea..9fe66357e010 100644 --- a/connectivity/source/drivers/firebird/Driver.cxx +++ b/connectivity/source/drivers/firebird/Driver.cxx @@ -49,7 +49,7 @@ namespace connectivity namespace firebird { Reference< XInterface > SAL_CALL FirebirdDriver_CreateInstance( - const Reference< XMultiServiceFactory >& _rxFactory) throw( Exception, std::exception ) + const Reference< XMultiServiceFactory >& _rxFactory) { SAL_INFO("connectivity.firebird", "FirebirdDriver_CreateInstance()" ); return *(new FirebirdDriver(comphelper::getComponentContext(_rxFactory))); @@ -143,12 +143,12 @@ void FirebirdDriver::disposing() } //----- static ServiceInfo --------------------------------------------------- -rtl::OUString FirebirdDriver::getImplementationName_Static() throw(RuntimeException) +rtl::OUString FirebirdDriver::getImplementationName_Static() { return rtl::OUString("com.sun.star.comp.sdbc.firebird.Driver"); } -Sequence< OUString > FirebirdDriver::getSupportedServiceNames_Static() throw (RuntimeException) +Sequence< OUString > FirebirdDriver::getSupportedServiceNames_Static() { Sequence< OUString > aSNS( 2 ); aSNS[0] = "com.sun.star.sdbc.Driver"; @@ -156,19 +156,17 @@ Sequence< OUString > FirebirdDriver::getSupportedServiceNames_Static() throw (Ru return aSNS; } -OUString SAL_CALL FirebirdDriver::getImplementationName() throw(RuntimeException, std::exception) +OUString SAL_CALL FirebirdDriver::getImplementationName() { return getImplementationName_Static(); } sal_Bool SAL_CALL FirebirdDriver::supportsService(const OUString& _rServiceName) - throw(RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } Sequence< OUString > SAL_CALL FirebirdDriver::getSupportedServiceNames() - throw(RuntimeException, std::exception) { return getSupportedServiceNames_Static(); } @@ -176,7 +174,6 @@ Sequence< OUString > SAL_CALL FirebirdDriver::getSupportedServiceNames() // ---- XDriver ------------------------------------------------------------- Reference< XConnection > SAL_CALL FirebirdDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) - throw(SQLException, RuntimeException, std::exception) { Reference< XConnection > xConnection; @@ -202,7 +199,6 @@ Reference< XConnection > SAL_CALL FirebirdDriver::connect( } sal_Bool SAL_CALL FirebirdDriver::acceptsURL( const OUString& url ) - throw(SQLException, RuntimeException, std::exception) { SvtMiscOptions aMiscOptions; @@ -212,7 +208,6 @@ sal_Bool SAL_CALL FirebirdDriver::acceptsURL( const OUString& url ) Sequence< DriverPropertyInfo > SAL_CALL FirebirdDriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& info ) - throw(SQLException, RuntimeException, std::exception) { (void) info; if ( ! acceptsURL(url) ) @@ -225,14 +220,14 @@ Sequence< DriverPropertyInfo > SAL_CALL FirebirdDriver::getPropertyInfo( return Sequence< DriverPropertyInfo >(); } -sal_Int32 SAL_CALL FirebirdDriver::getMajorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL FirebirdDriver::getMajorVersion( ) { // The major and minor version are sdbc driver specific. Must begin with 1.0 // as per http://api.libreoffice.org/docs/common/ref/com/sun/star/sdbc/XDriver.html return 1; } -sal_Int32 SAL_CALL FirebirdDriver::getMinorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL FirebirdDriver::getMinorVersion( ) { return 0; } @@ -240,7 +235,6 @@ sal_Int32 SAL_CALL FirebirdDriver::getMinorVersion( ) throw(RuntimeException, s //----- XDataDefinitionSupplier uno::Reference< XTablesSupplier > SAL_CALL FirebirdDriver::getDataDefinitionByConnection( const uno::Reference< XConnection >& rConnection) - throw(SQLException, RuntimeException, std::exception) { Connection* pConnection = static_cast< Connection* >(rConnection.get()); return uno::Reference< XTablesSupplier >(pConnection->createCatalog(), UNO_QUERY); @@ -249,7 +243,6 @@ uno::Reference< XTablesSupplier > SAL_CALL FirebirdDriver::getDataDefinitionByCo uno::Reference< XTablesSupplier > SAL_CALL FirebirdDriver::getDataDefinitionByURL( const OUString& rURL, const uno::Sequence< PropertyValue >& rInfo) - throw(SQLException, RuntimeException, std::exception) { uno::Reference< XConnection > xConnection = connect(rURL, rInfo); return getDataDefinitionByConnection(xConnection); @@ -295,7 +288,7 @@ namespace connectivity osl_atomic_increment( &_refCount ); } - void checkDisposed(bool _bThrow) throw ( DisposedException ) + void checkDisposed(bool _bThrow) { if (_bThrow) throw DisposedException(); diff --git a/connectivity/source/drivers/firebird/Driver.hxx b/connectivity/source/drivers/firebird/Driver.hxx index a48b13e11f53..c314fc69fe4f 100644 --- a/connectivity/source/drivers/firebird/Driver.hxx +++ b/connectivity/source/drivers/firebird/Driver.hxx @@ -39,7 +39,7 @@ namespace connectivity static const int FIREBIRD_SQL_DIALECT = 3; /// @throws css::uno::Exception - css::uno::Reference< css::uno::XInterface > SAL_CALL FirebirdDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception, std::exception ); + css::uno::Reference< css::uno::XInterface > SAL_CALL FirebirdDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory); typedef ::cppu::WeakComponentImplHelper< css::sdbc::XDriver, css::sdbcx::XDataDefinitionSupplier, @@ -68,34 +68,30 @@ namespace connectivity virtual void SAL_CALL disposing() override; // XInterface /// @throws css::uno::RuntimeException - static ::rtl::OUString getImplementationName_Static( ) throw(css::uno::RuntimeException); + static ::rtl::OUString getImplementationName_Static( ); /// @throws css::uno::RuntimeException - static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw (css::uno::RuntimeException); + static css::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ); // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + virtual ::rtl::OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) override; + virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) override; // XDriver - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const ::rtl::OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL acceptsURL( const ::rtl::OUString& url ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const ::rtl::OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMajorVersion( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMinorVersion( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const ::rtl::OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override; + virtual sal_Bool SAL_CALL acceptsURL( const ::rtl::OUString& url ) override; + virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const ::rtl::OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override; + virtual sal_Int32 SAL_CALL getMajorVersion( ) override; + virtual sal_Int32 SAL_CALL getMinorVersion( ) override; // XDataDefinitionSupplier virtual css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByConnection( - const css::uno::Reference< css::sdbc::XConnection >& rxConnection) - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::sdbc::XConnection >& rxConnection) override; virtual css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL getDataDefinitionByURL( const OUString& rsURL, - const css::uno::Sequence< css::beans::PropertyValue >& rInfo) - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Sequence< css::beans::PropertyValue >& rInfo) override; }; } diff --git a/connectivity/source/drivers/firebird/PreparedStatement.cxx b/connectivity/source/drivers/firebird/PreparedStatement.cxx index b427c5fe358c..970c24c2d924 100644 --- a/connectivity/source/drivers/firebird/PreparedStatement.cxx +++ b/connectivity/source/drivers/firebird/PreparedStatement.cxx @@ -63,7 +63,6 @@ OPreparedStatement::OPreparedStatement( Connection* _pConnection, } void OPreparedStatement::ensurePrepared() - throw (SQLException, RuntimeException) { MutexGuard aGuard(m_aMutex); checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); @@ -128,7 +127,6 @@ void SAL_CALL OPreparedStatement::release() throw() } Any SAL_CALL OPreparedStatement::queryInterface(const Type& rType) - throw(RuntimeException, std::exception) { Any aRet = OStatementCommonBase::queryInterface(rType); if(!aRet.hasValue()) @@ -137,14 +135,12 @@ Any SAL_CALL OPreparedStatement::queryInterface(const Type& rType) } uno::Sequence< Type > SAL_CALL OPreparedStatement::getTypes() - throw(RuntimeException, std::exception) { return concatSequences(OPreparedStatement_Base::getTypes(), OStatementCommonBase::getTypes()); } Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData() - throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); @@ -157,7 +153,7 @@ Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData() return m_xMetaData; } -void SAL_CALL OPreparedStatement::close() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::close() { MutexGuard aGuard( m_aMutex ); checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); @@ -184,7 +180,6 @@ void SAL_CALL OPreparedStatement::disposing() void SAL_CALL OPreparedStatement::setString(sal_Int32 nParameterIndex, const OUString& x) - throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.firebird", "setString(" << nParameterIndex << " , " << x << ")"); @@ -234,7 +229,6 @@ void SAL_CALL OPreparedStatement::setString(sal_Int32 nParameterIndex, } Reference< XConnection > SAL_CALL OPreparedStatement::getConnection() - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); @@ -243,7 +237,6 @@ Reference< XConnection > SAL_CALL OPreparedStatement::getConnection() } sal_Bool SAL_CALL OPreparedStatement::execute() - throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.firebird", "executeQuery(). " "Got called with sql: " << m_sSqlStatement); @@ -296,14 +289,12 @@ sal_Bool SAL_CALL OPreparedStatement::execute() } sal_Int32 SAL_CALL OPreparedStatement::executeUpdate() - throw(SQLException, RuntimeException, std::exception) { execute(); return getStatementChangeCount(); } Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery() - throw(SQLException, RuntimeException, std::exception) { execute(); return m_xResultSet; @@ -346,7 +337,6 @@ sal_Int64 toNumericWithoutDecimalPlace(const OUString& sSource) //----- XParameters ----------------------------------------------------------- void SAL_CALL OPreparedStatement::setNull(sal_Int32 nIndex, sal_Int32 /*nSqlType*/) - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard( m_aMutex ); checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); @@ -356,14 +346,12 @@ void SAL_CALL OPreparedStatement::setNull(sal_Int32 nIndex, sal_Int32 /*nSqlType } void SAL_CALL OPreparedStatement::setBoolean(sal_Int32 nIndex, sal_Bool bValue) - throw(SQLException, RuntimeException, std::exception) { setValue< sal_Bool >(nIndex, bValue, SQL_BOOLEAN); } template void OPreparedStatement::setValue(sal_Int32 nIndex, T& nValue, ISC_SHORT nType) - throw(SQLException, RuntimeException) { MutexGuard aGuard( m_aMutex ); checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); @@ -386,43 +374,36 @@ void OPreparedStatement::setValue(sal_Int32 nIndex, T& nValue, ISC_SHORT nType) } void SAL_CALL OPreparedStatement::setByte(sal_Int32 /*nIndex*/, sal_Int8 /*nValue*/) - throw(SQLException, RuntimeException, std::exception) { ::dbtools::throwFunctionNotSupportedSQLException("XParameters::setByte", *this); } void SAL_CALL OPreparedStatement::setShort(sal_Int32 nIndex, sal_Int16 nValue) - throw(SQLException, RuntimeException, std::exception) { setValue< sal_Int16 >(nIndex, nValue, SQL_SHORT); } void SAL_CALL OPreparedStatement::setInt(sal_Int32 nIndex, sal_Int32 nValue) - throw(SQLException, RuntimeException, std::exception) { setValue< sal_Int32 >(nIndex, nValue, SQL_LONG); } void SAL_CALL OPreparedStatement::setLong(sal_Int32 nIndex, sal_Int64 nValue) - throw(SQLException, RuntimeException, std::exception) { setValue< sal_Int64 >(nIndex, nValue, SQL_INT64); } void SAL_CALL OPreparedStatement::setFloat(sal_Int32 nIndex, float nValue) - throw(SQLException, RuntimeException, std::exception) { setValue< float >(nIndex, nValue, SQL_FLOAT); } void SAL_CALL OPreparedStatement::setDouble(sal_Int32 nIndex, double nValue) - throw(SQLException, RuntimeException, std::exception) { setValue< double >(nIndex, nValue, SQL_DOUBLE); // TODO: SQL_D_FLOAT? } void SAL_CALL OPreparedStatement::setDate(sal_Int32 nIndex, const Date& rDate) - throw(SQLException, RuntimeException, std::exception) { struct tm aCTime; aCTime.tm_mday = rDate.Day; @@ -436,7 +417,6 @@ void SAL_CALL OPreparedStatement::setDate(sal_Int32 nIndex, const Date& rDate) } void SAL_CALL OPreparedStatement::setTime( sal_Int32 nIndex, const css::util::Time& rTime) - throw(SQLException, RuntimeException, std::exception) { struct tm aCTime; aCTime.tm_sec = rTime.Seconds; @@ -450,7 +430,6 @@ void SAL_CALL OPreparedStatement::setTime( sal_Int32 nIndex, const css::util::Ti } void SAL_CALL OPreparedStatement::setTimestamp(sal_Int32 nIndex, const DateTime& rTimestamp) - throw(SQLException, RuntimeException, std::exception) { struct tm aCTime; aCTime.tm_sec = rTimestamp.Seconds; @@ -504,7 +483,7 @@ void OPreparedStatement::closeBlobAfterWriting(isc_blob_handle& rBlobHandle) } } -void SAL_CALL OPreparedStatement::setClob( sal_Int32 parameterIndex, const Reference< XClob >& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setClob( sal_Int32 parameterIndex, const Reference< XClob >& x ) { (void) parameterIndex; (void) x; @@ -515,7 +494,6 @@ void SAL_CALL OPreparedStatement::setClob( sal_Int32 parameterIndex, const Refer void SAL_CALL OPreparedStatement::setBlob(sal_Int32 nParameterIndex, const Reference< XBlob >& xBlob) - throw (SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); @@ -565,7 +543,7 @@ void SAL_CALL OPreparedStatement::setBlob(sal_Int32 nParameterIndex, } -void SAL_CALL OPreparedStatement::setArray( sal_Int32 parameterIndex, const Reference< XArray >& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setArray( sal_Int32 parameterIndex, const Reference< XArray >& x ) { (void) parameterIndex; (void) x; @@ -575,7 +553,7 @@ void SAL_CALL OPreparedStatement::setArray( sal_Int32 parameterIndex, const Refe } -void SAL_CALL OPreparedStatement::setRef( sal_Int32 parameterIndex, const Reference< XRef >& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setRef( sal_Int32 parameterIndex, const Reference< XRef >& x ) { (void) parameterIndex; (void) x; @@ -585,7 +563,7 @@ void SAL_CALL OPreparedStatement::setRef( sal_Int32 parameterIndex, const Refere } -void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 sqlType, sal_Int32 scale ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 sqlType, sal_Int32 scale ) { checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); @@ -669,7 +647,7 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, c } -void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) { (void) parameterIndex; (void) sqlType; @@ -680,7 +658,7 @@ void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_I } -void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) { (void) parameterIndex; (void) x; @@ -691,7 +669,6 @@ void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any void SAL_CALL OPreparedStatement::setBytes(sal_Int32 nParameterIndex, const Sequence< sal_Int8 >& xBytes) - throw (SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); @@ -738,7 +715,7 @@ void SAL_CALL OPreparedStatement::setBytes(sal_Int32 nParameterIndex, } -void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) { (void) parameterIndex; (void) x; @@ -749,7 +726,7 @@ void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, } -void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) { (void) parameterIndex; (void) x; @@ -760,31 +737,28 @@ void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, con } -void SAL_CALL OPreparedStatement::clearParameters( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::clearParameters( ) { } // ---- Batch methods -- unsupported ----------------------------------------- void SAL_CALL OPreparedStatement::clearBatch() - throw(SQLException, RuntimeException, std::exception) { // Unsupported } void SAL_CALL OPreparedStatement::addBatch() - throw(SQLException, RuntimeException, std::exception) { // Unsupported by firebird } Sequence< sal_Int32 > SAL_CALL OPreparedStatement::executeBatch() - throw(SQLException, RuntimeException, std::exception) { // Unsupported by firebird return Sequence< sal_Int32 >(); } -void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception, std::exception) +void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) { switch(nHandle) { @@ -802,7 +776,6 @@ void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,cons } void OPreparedStatement::checkParameterIndex(sal_Int32 nParameterIndex) - throw(SQLException, RuntimeException) { ensurePrepared(); if ((nParameterIndex == 0) || (nParameterIndex > m_pInSqlda->sqld)) diff --git a/connectivity/source/drivers/firebird/PreparedStatement.hxx b/connectivity/source/drivers/firebird/PreparedStatement.hxx index 0062110899dd..986752cd66c1 100644 --- a/connectivity/source/drivers/firebird/PreparedStatement.hxx +++ b/connectivity/source/drivers/firebird/PreparedStatement.hxx @@ -55,9 +55,7 @@ namespace connectivity XSQLDA* m_pInSqlda; /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - void checkParameterIndex(sal_Int32 nParameterIndex) - throw(css::sdbc::SQLException, - css::uno::RuntimeException); + void checkParameterIndex(sal_Int32 nParameterIndex); /** * Set a numeric value in the input SQLDA. If the destination @@ -66,16 +64,12 @@ namespace connectivity * @throws css::sdbc::SQLException * @throws css::uno::RuntimeException */ - template void setValue(sal_Int32 nIndex, T& nValue, ISC_SHORT nType) - throw(css::sdbc::SQLException, - css::uno::RuntimeException); + template void setValue(sal_Int32 nIndex, T& nValue, ISC_SHORT nType); void setParameterNull(sal_Int32 nParameterIndex, bool bSetNull = true); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - void ensurePrepared() - throw(css::sdbc::SQLException, - css::uno::RuntimeException); + void ensurePrepared(); /** * Assumes that all necessary mutexes have been taken. */ @@ -87,8 +81,7 @@ namespace connectivity protected: virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, - const css::uno::Any& rValue) - throw (css::uno::Exception, std::exception) override; + const css::uno::Any& rValue) override; virtual ~OPreparedStatement() override; public: DECLARE_SERVICE_INFO(); @@ -97,90 +90,62 @@ namespace connectivity const ::rtl::OUString& sql); //XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; //XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; // XPreparedStatement virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL - executeQuery() - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + executeQuery() override; virtual sal_Int32 SAL_CALL - executeUpdate() - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + executeUpdate() override; virtual sal_Bool SAL_CALL - execute() - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + execute() override; virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL - getConnection() - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + getConnection() override; // XParameters - virtual void SAL_CALL setNull(sal_Int32 nIndex, sal_Int32 nValue) - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBoolean( sal_Int32 nIndex, sal_Bool nValue) - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setByte(sal_Int32 nIndex, sal_Int8 nValue) - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setShort(sal_Int32 nIndex, sal_Int16 nValue) - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setInt(sal_Int32 nIndex, sal_Int32 nValue) - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLong(sal_Int32 nIndex, sal_Int64 nValue) - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearParameters( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setNull(sal_Int32 nIndex, sal_Int32 nValue) override; + virtual void SAL_CALL setObjectNull(sal_Int32 parameterIndex, sal_Int32 sqlType, const ::rtl::OUString& typeName ) override; + virtual void SAL_CALL setBoolean( sal_Int32 nIndex, sal_Bool nValue) override; + virtual void SAL_CALL setByte(sal_Int32 nIndex, sal_Int8 nValue) override; + virtual void SAL_CALL setShort(sal_Int32 nIndex, sal_Int16 nValue) override; + virtual void SAL_CALL setInt(sal_Int32 nIndex, sal_Int32 nValue) override; + virtual void SAL_CALL setLong(sal_Int32 nIndex, sal_Int64 nValue) override; + virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) override; + virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) override; + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const ::rtl::OUString& x ) override; + virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) override; + virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) override; + virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) override; + virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) override; + virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) override; + virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) override; + virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) override; + virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) override; + virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) override; + virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) override; + virtual void SAL_CALL clearParameters( ) override; // XPreparedBatchExecution -- UNSUPPORTED by firebird virtual void SAL_CALL - addBatch() - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + addBatch() override; virtual void SAL_CALL - clearBatch() - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + clearBatch() override; virtual css::uno::Sequence< sal_Int32 > SAL_CALL - executeBatch() - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + executeBatch() override; // XCloseable - virtual void SAL_CALL close() - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close() override; // OComponentHelper virtual void SAL_CALL disposing() override; // XResultSetMetaDataSupplier - virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) override; }; } diff --git a/connectivity/source/drivers/firebird/ResultSet.cxx b/connectivity/source/drivers/firebird/ResultSet.cxx index cc9dedc24cc0..4aebf25e810a 100644 --- a/connectivity/source/drivers/firebird/ResultSet.cxx +++ b/connectivity/source/drivers/firebird/ResultSet.cxx @@ -113,7 +113,7 @@ OResultSet::~OResultSet() } // ---- XResultSet -- Row retrieval methods ------------------------------------ -sal_Int32 SAL_CALL OResultSet::getRow() throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSet::getRow() { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -121,7 +121,7 @@ sal_Int32 SAL_CALL OResultSet::getRow() throw(SQLException, RuntimeException, st return m_currentRow; } -sal_Bool SAL_CALL OResultSet::next() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::next() { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -150,21 +150,21 @@ sal_Bool SAL_CALL OResultSet::next() throw(SQLException, RuntimeException, std:: } } -sal_Bool SAL_CALL OResultSet::previous() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::previous() { ::dbtools::throwFunctionNotSupportedSQLException("previous not supported in firebird", *this); return false; } -sal_Bool SAL_CALL OResultSet::isLast() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::isLast() { ::dbtools::throwFunctionNotSupportedSQLException("isLast not supported in firebird", *this); return false; } -sal_Bool SAL_CALL OResultSet::isBeforeFirst() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::isBeforeFirst() { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -172,7 +172,7 @@ sal_Bool SAL_CALL OResultSet::isBeforeFirst() throw(SQLException, RuntimeExcepti return m_currentRow == 0; } -sal_Bool SAL_CALL OResultSet::isAfterLast() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::isAfterLast() { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -180,7 +180,7 @@ sal_Bool SAL_CALL OResultSet::isAfterLast() throw(SQLException, RuntimeException return m_bIsAfterLastRow; } -sal_Bool SAL_CALL OResultSet::isFirst() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::isFirst() { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -188,7 +188,7 @@ sal_Bool SAL_CALL OResultSet::isFirst() throw(SQLException, RuntimeException, st return m_currentRow == 1 && !m_bIsAfterLastRow; } -void SAL_CALL OResultSet::beforeFirst() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::beforeFirst() { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -198,7 +198,7 @@ void SAL_CALL OResultSet::beforeFirst() throw(SQLException, RuntimeException, st *this); } -void SAL_CALL OResultSet::afterLast() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::afterLast() { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -208,7 +208,7 @@ void SAL_CALL OResultSet::afterLast() throw(SQLException, RuntimeException, std: *this); } -sal_Bool SAL_CALL OResultSet::first() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::first() { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -229,7 +229,7 @@ sal_Bool SAL_CALL OResultSet::first() throw(SQLException, RuntimeException, std: } } -sal_Bool SAL_CALL OResultSet::last() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::last() { // We need to iterate past the last row to know when we've passed the last // row, hence we can't actually move to last. @@ -238,7 +238,7 @@ sal_Bool SAL_CALL OResultSet::last() throw(SQLException, RuntimeException, std:: return false; } -sal_Bool SAL_CALL OResultSet::absolute(sal_Int32 aRow) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::absolute(sal_Int32 aRow) { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -256,7 +256,7 @@ sal_Bool SAL_CALL OResultSet::absolute(sal_Int32 aRow) throw(SQLException, Runti } } -sal_Bool SAL_CALL OResultSet::relative(sal_Int32 row) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::relative(sal_Int32 row) { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -279,7 +279,6 @@ sal_Bool SAL_CALL OResultSet::relative(sal_Int32 row) throw(SQLException, Runtim } void SAL_CALL OResultSet::checkColumnIndex(sal_Int32 nIndex) - throw (SQLException, RuntimeException) { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -294,7 +293,6 @@ void SAL_CALL OResultSet::checkColumnIndex(sal_Int32 nIndex) } void SAL_CALL OResultSet::checkRowIndex() - throw (SQLException, RuntimeException) { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -308,19 +306,18 @@ void SAL_CALL OResultSet::checkRowIndex() } } -Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OResultSet::queryInterface( const Type & rType ) { Any aRet = OPropertySetHelper::queryInterface(rType); return aRet.hasValue() ? aRet : OResultSet_BASE::queryInterface(rType); } - Sequence< Type > SAL_CALL OResultSet::getTypes() throw( RuntimeException, std::exception) + Sequence< Type > SAL_CALL OResultSet::getTypes() { return concatSequences(OPropertySetHelper::getTypes(), OResultSet_BASE::getTypes()); } // ---- XColumnLocate --------------------------------------------------------- sal_Int32 SAL_CALL OResultSet::findColumn(const OUString& rColumnName) - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -342,7 +339,7 @@ sal_Int32 SAL_CALL OResultSet::findColumn(const OUString& rColumnName) return 0; // Never reached } -uno::Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +uno::Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 columnIndex ) { (void) columnIndex; MutexGuard aGuard(m_rMutex); @@ -351,7 +348,7 @@ uno::Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 c return nullptr; } -uno::Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +uno::Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 columnIndex ) { (void) columnIndex; MutexGuard aGuard(m_rMutex); @@ -633,7 +630,7 @@ T OResultSet::safelyRetrieveValue(const sal_Int32 nColumnIndex, const ISC_SHORT } // ---- XRow ----------------------------------------------------------------- -sal_Bool SAL_CALL OResultSet::wasNull() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::wasNull() { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -643,20 +640,17 @@ sal_Bool SAL_CALL OResultSet::wasNull() throw(SQLException, RuntimeException, st // ---- XRow: Simple Numerical types ------------------------------------------ sal_Bool SAL_CALL OResultSet::getBoolean(sal_Int32 nColumnIndex) - throw(SQLException, RuntimeException, std::exception) { return safelyRetrieveValue< bool >(nColumnIndex, SQL_BOOLEAN); } sal_Int8 SAL_CALL OResultSet::getByte(sal_Int32 nColumnIndex) - throw(SQLException, RuntimeException, std::exception) { // Not a native firebird type hence we always have to convert. return safelyRetrieveValue< ORowSetValue >(nColumnIndex); } Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes(sal_Int32 columnIndex) - throw(SQLException, RuntimeException, std::exception) { (void) columnIndex; return Sequence< sal_Int8 >(); // TODO: implement @@ -664,62 +658,53 @@ Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes(sal_Int32 columnIndex) } sal_Int16 SAL_CALL OResultSet::getShort(sal_Int32 columnIndex) - throw(SQLException, RuntimeException, std::exception) { return safelyRetrieveValue< sal_Int16 >(columnIndex, SQL_SHORT); } sal_Int32 SAL_CALL OResultSet::getInt(sal_Int32 columnIndex) - throw(SQLException, RuntimeException, std::exception) { return safelyRetrieveValue< sal_Int32 >(columnIndex, SQL_LONG); } sal_Int64 SAL_CALL OResultSet::getLong(sal_Int32 columnIndex) - throw(SQLException, RuntimeException, std::exception) { return safelyRetrieveValue< sal_Int64 >(columnIndex, SQL_INT64); } float SAL_CALL OResultSet::getFloat(sal_Int32 columnIndex) - throw(SQLException, RuntimeException, std::exception) { return safelyRetrieveValue< float >(columnIndex, SQL_FLOAT); } double SAL_CALL OResultSet::getDouble(sal_Int32 columnIndex) - throw(SQLException, RuntimeException, std::exception) { return safelyRetrieveValue< double >(columnIndex, SQL_DOUBLE); } // ---- XRow: More complex types ---------------------------------------------- OUString SAL_CALL OResultSet::getString(sal_Int32 nIndex) - throw(SQLException, RuntimeException, std::exception) { return safelyRetrieveValue< OUString >(nIndex); } Date SAL_CALL OResultSet::getDate(sal_Int32 nIndex) - throw(SQLException, RuntimeException, std::exception) { return safelyRetrieveValue< Date >(nIndex, SQL_TYPE_DATE); } Time SAL_CALL OResultSet::getTime(sal_Int32 nIndex) - throw(SQLException, RuntimeException, std::exception) { return safelyRetrieveValue< css::util::Time >(nIndex, SQL_TYPE_TIME); } DateTime SAL_CALL OResultSet::getTimestamp(sal_Int32 nIndex) - throw(SQLException, RuntimeException, std::exception) { return safelyRetrieveValue< DateTime >(nIndex, SQL_TIMESTAMP); } -uno::Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +uno::Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -730,7 +715,7 @@ uno::Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) throw( return m_xMetaData; } -uno::Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +uno::Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 columnIndex ) { (void) columnIndex; MutexGuard aGuard(m_rMutex); @@ -740,7 +725,7 @@ uno::Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 columnIndex ) } -uno::Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +uno::Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 columnIndex ) { (void) columnIndex; MutexGuard aGuard(m_rMutex); @@ -758,7 +743,6 @@ uno::Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 columnIndex ) th } uno::Reference< XBlob > SAL_CALL OResultSet::getBlob(sal_Int32 columnIndex) - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -772,7 +756,7 @@ uno::Reference< XBlob > SAL_CALL OResultSet::getBlob(sal_Int32 columnIndex) } -uno::Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +uno::Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 columnIndex ) { (void) columnIndex; MutexGuard aGuard(m_rMutex); @@ -782,7 +766,7 @@ uno::Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 columnIndex ) thro } -Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const uno::Reference< css::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const uno::Reference< css::container::XNameAccess >& typeMap ) { (void) columnIndex; (void) typeMap; @@ -793,7 +777,7 @@ Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const uno::Reference< } -void SAL_CALL OResultSet::close() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::close() { SAL_INFO("connectivity.firebird", "close()."); @@ -806,7 +790,6 @@ void SAL_CALL OResultSet::close() throw(SQLException, RuntimeException, std::exc uno::Reference< XInterface > SAL_CALL OResultSet::getStatement() - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -814,34 +797,34 @@ uno::Reference< XInterface > SAL_CALL OResultSet::getStatement() return m_xStatement; } //----- XResultSet: unsupported change detection methods --------------------- -sal_Bool SAL_CALL OResultSet::rowDeleted() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::rowDeleted() { ::dbtools::throwFunctionNotSupportedSQLException("rowDeleted not supported in firebird", *this); return false; } -sal_Bool SAL_CALL OResultSet::rowInserted() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::rowInserted() { ::dbtools::throwFunctionNotSupportedSQLException("rowInserted not supported in firebird", *this); return false; } -sal_Bool SAL_CALL OResultSet::rowUpdated() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::rowUpdated() { ::dbtools::throwFunctionNotSupportedSQLException("rowUpdated not supported in firebird", *this); return false; } -void SAL_CALL OResultSet::refreshRow() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::refreshRow() { ::dbtools::throwFunctionNotSupportedSQLException("refreshRow not supported in firebird", *this); } -void SAL_CALL OResultSet::cancel( ) throw(RuntimeException, std::exception) +void SAL_CALL OResultSet::cancel( ) { MutexGuard aGuard(m_rMutex); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -887,25 +870,23 @@ void SAL_CALL OResultSet::release() throw() OResultSet_BASE::release(); } -uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) +uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } // ---- XServiceInfo ----------------------------------------------------------- -OUString SAL_CALL OResultSet::getImplementationName() throw ( RuntimeException, std::exception) +OUString SAL_CALL OResultSet::getImplementationName() { return OUString("com.sun.star.sdbcx.firebird.ResultSet"); } Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames() - throw( RuntimeException, std::exception) { return {"com.sun.star.sdbc.ResultSet","com.sun.star.sdbcx.ResultSet"}; } sal_Bool SAL_CALL OResultSet::supportsService(const OUString& _rServiceName) - throw( RuntimeException, std::exception) { return cppu::supportsService(this, _rServiceName); } diff --git a/connectivity/source/drivers/firebird/ResultSet.hxx b/connectivity/source/drivers/firebird/ResultSet.hxx index 7d2a7c40bfec..75b0d6fcd60d 100644 --- a/connectivity/source/drivers/firebird/ResultSet.hxx +++ b/connectivity/source/drivers/firebird/ResultSet.hxx @@ -115,14 +115,10 @@ namespace connectivity /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - void SAL_CALL checkColumnIndex( sal_Int32 index ) - throw (css::sdbc::SQLException, - css::uno::RuntimeException); + void SAL_CALL checkColumnIndex( sal_Int32 index ); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - void SAL_CALL checkRowIndex() - throw (css::sdbc::SQLException, - css::uno::RuntimeException); + void SAL_CALL checkRowIndex(); // you can't delete objects of this type virtual ~OResultSet() override; @@ -138,60 +134,59 @@ namespace connectivity // XInterface virtual css::uno::Any SAL_CALL queryInterface( - const css::uno::Type& rType) - throw (css::uno::RuntimeException, std::exception) override; + const css::uno::Type& rType) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; //XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; // XResultSet - virtual sal_Bool SAL_CALL next( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isBeforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAfterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL beforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL afterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL first( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL last( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL previous( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL refreshRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowUpdated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowInserted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowDeleted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL next( ) override; + virtual sal_Bool SAL_CALL isBeforeFirst( ) override; + virtual sal_Bool SAL_CALL isAfterLast( ) override; + virtual sal_Bool SAL_CALL isFirst( ) override; + virtual sal_Bool SAL_CALL isLast( ) override; + virtual void SAL_CALL beforeFirst( ) override; + virtual void SAL_CALL afterLast( ) override; + virtual sal_Bool SAL_CALL first( ) override; + virtual sal_Bool SAL_CALL last( ) override; + virtual sal_Int32 SAL_CALL getRow( ) override; + virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) override; + virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) override; + virtual sal_Bool SAL_CALL previous( ) override; + virtual void SAL_CALL refreshRow( ) override; + virtual sal_Bool SAL_CALL rowUpdated( ) override; + virtual sal_Bool SAL_CALL rowInserted( ) override; + virtual sal_Bool SAL_CALL rowDeleted( ) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement( ) override; // XRow - virtual sal_Bool SAL_CALL wasNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL wasNull( ) override; + virtual ::rtl::OUString SAL_CALL getString( sal_Int32 columnIndex ) override; + virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override; + virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override; + virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override; + virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) override; + virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) override; + virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) override; + virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) override; + virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) override; + virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) override; + virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) override; + virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; + virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override; // XResultSetMetaDataSupplier - virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) override; // XCancellable - virtual void SAL_CALL cancel( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cancel( ) override; // XCloseable - virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) override; // XWarningsSupplier #if 0 virtual css::uno::Any SAL_CALL getWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; @@ -199,9 +194,7 @@ namespace connectivity #endif // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn(const ::rtl::OUString& columnName) - throw(css::sdbc::SQLException, - css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL findColumn(const ::rtl::OUString& columnName) override; }; diff --git a/connectivity/source/drivers/firebird/ResultSetMetaData.cxx b/connectivity/source/drivers/firebird/ResultSetMetaData.cxx index 7d2dd2f392a5..79262d8f1d70 100644 --- a/connectivity/source/drivers/firebird/ResultSetMetaData.cxx +++ b/connectivity/source/drivers/firebird/ResultSetMetaData.cxx @@ -40,25 +40,23 @@ OResultSetMetaData::~OResultSetMetaData() } void OResultSetMetaData::verifyValidColumn(sal_Int32 column) - throw(SQLException) { if (column>getColumnCount() || column < 1) throw SQLException("Invalid column specified", *this, OUString(), 0, Any()); } -sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount() throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount() { return m_pSqlda->sqld; } -sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) { verifyValidColumn(column); return 32; // Hard limit for firebird } sal_Int32 SAL_CALL OResultSetMetaData::getColumnType(sal_Int32 column) - throw(SQLException, RuntimeException, std::exception) { verifyValidColumn(column); @@ -69,7 +67,6 @@ sal_Int32 SAL_CALL OResultSetMetaData::getColumnType(sal_Int32 column) } sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive(sal_Int32 column) - throw(SQLException, RuntimeException, std::exception) { // Firebird is generally case sensitive when using quoted identifiers. // IF THIS CHANGES make ResultSet::findColumn to be case-insensitive as needed. @@ -81,14 +78,12 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive(sal_Int32 column) } OUString SAL_CALL OResultSetMetaData::getSchemaName(sal_Int32 column) - throw(SQLException, RuntimeException, std::exception) { (void) column; return OUString(); // Schemas supported by firebird } OUString SAL_CALL OResultSetMetaData::getColumnName(sal_Int32 column) - throw(SQLException, RuntimeException, std::exception) { verifyValidColumn(column); OUString sRet(m_pSqlda->sqlvar[column-1].sqlname, @@ -99,7 +94,6 @@ OUString SAL_CALL OResultSetMetaData::getColumnName(sal_Int32 column) } OUString SAL_CALL OResultSetMetaData::getTableName(sal_Int32 column) - throw(SQLException, RuntimeException, std::exception) { verifyValidColumn(column); return OUString(m_pSqlda->sqlvar[column-1].relname, @@ -108,14 +102,12 @@ OUString SAL_CALL OResultSetMetaData::getTableName(sal_Int32 column) } OUString SAL_CALL OResultSetMetaData::getCatalogName(sal_Int32 column) - throw(SQLException, RuntimeException, std::exception) { (void) column; return OUString(); // Catalogs not supported by firebird } OUString SAL_CALL OResultSetMetaData::getColumnTypeName(sal_Int32 column) - throw(SQLException, RuntimeException, std::exception) { verifyValidColumn(column); @@ -126,7 +118,6 @@ OUString SAL_CALL OResultSetMetaData::getColumnTypeName(sal_Int32 column) } OUString SAL_CALL OResultSetMetaData::getColumnLabel(sal_Int32 column) - throw(SQLException, RuntimeException, std::exception) { // aliasname verifyValidColumn(column); @@ -138,7 +129,6 @@ OUString SAL_CALL OResultSetMetaData::getColumnLabel(sal_Int32 column) } OUString SAL_CALL OResultSetMetaData::getColumnServiceName(sal_Int32 column) - throw(SQLException, RuntimeException, std::exception) { // TODO: implement (void) column; @@ -146,14 +136,12 @@ OUString SAL_CALL OResultSetMetaData::getColumnServiceName(sal_Int32 column) } sal_Bool SAL_CALL OResultSetMetaData::isCurrency(sal_Int32 column) - throw(SQLException, RuntimeException, std::exception) { (void) column; return false; } sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement(sal_Int32 column) - throw(SQLException, RuntimeException, std::exception) { OUString sTable = getTableName(column); if( !sTable.isEmpty() ) @@ -190,7 +178,6 @@ sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement(sal_Int32 column) sal_Bool SAL_CALL OResultSetMetaData::isSigned(sal_Int32 column) - throw(SQLException, RuntimeException, std::exception) { // Unsigned values aren't supported in firebird. (void) column; @@ -198,7 +185,6 @@ sal_Bool SAL_CALL OResultSetMetaData::isSigned(sal_Int32 column) } sal_Int32 SAL_CALL OResultSetMetaData::getPrecision(sal_Int32 column) - throw(SQLException, RuntimeException, std::exception) { sal_Int32 nType = getColumnType(column); if( nType == DataType::NUMERIC || nType == DataType::DECIMAL ) @@ -234,13 +220,11 @@ sal_Int32 SAL_CALL OResultSetMetaData::getPrecision(sal_Int32 column) } sal_Int32 SAL_CALL OResultSetMetaData::getScale(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { return -(m_pSqlda->sqlvar[column-1].sqlscale); // fb stores negative number } sal_Int32 SAL_CALL OResultSetMetaData::isNullable(sal_Int32 column) - throw(SQLException, RuntimeException, std::exception) { if (m_pSqlda->sqlvar[column-1].sqltype & 1) return ColumnValue::NULLABLE; @@ -249,7 +233,6 @@ sal_Int32 SAL_CALL OResultSetMetaData::isNullable(sal_Int32 column) } sal_Bool SAL_CALL OResultSetMetaData::isSearchable(sal_Int32 column) - throw(SQLException, RuntimeException, std::exception) { // TODO: Can the column be used as part of a where clause? Assume yes (void) column; @@ -257,20 +240,18 @@ sal_Bool SAL_CALL OResultSetMetaData::isSearchable(sal_Int32 column) } sal_Bool SAL_CALL OResultSetMetaData::isReadOnly(sal_Int32 column) - throw(SQLException, RuntimeException, std::exception) { (void) column; return m_pConnection->isReadOnly(); // Readonly only available on db level } sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable(sal_Int32 column) - throw(SQLException, RuntimeException, std::exception) { (void) column; return !m_pConnection->isReadOnly(); } -sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) { (void) column; return !m_pConnection->isReadOnly(); diff --git a/connectivity/source/drivers/firebird/ResultSetMetaData.hxx b/connectivity/source/drivers/firebird/ResultSetMetaData.hxx index a183e97cd70a..d6dffe0cd708 100644 --- a/connectivity/source/drivers/firebird/ResultSetMetaData.hxx +++ b/connectivity/source/drivers/firebird/ResultSetMetaData.hxx @@ -44,7 +44,7 @@ namespace connectivity virtual ~OResultSetMetaData() override; /// @throws css::sdbc::SQLException - void verifyValidColumn(sal_Int32 column) throw(css::sdbc::SQLException); + void verifyValidColumn(sal_Int32 column); public: // a constructor, which is required for returning objects: OResultSetMetaData(Connection* pConnection, @@ -53,48 +53,27 @@ namespace connectivity , m_pSqlda(pSqlda) {} - virtual sal_Int32 SAL_CALL getColumnCount() - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAutoIncrement(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isCaseSensitive(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isSearchable(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isCurrency(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL isNullable(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isSigned(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getColumnDisplaySize(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getColumnLabel(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getColumnName(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getSchemaName(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getPrecision(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getScale(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getTableName(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getCatalogName(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getColumnType(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getColumnTypeName(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isWritable(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isDefinitelyWritable(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual ::rtl::OUString SAL_CALL getColumnServiceName(sal_Int32 column) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getColumnCount() override; + virtual sal_Bool SAL_CALL isAutoIncrement(sal_Int32 column) override; + virtual sal_Bool SAL_CALL isCaseSensitive(sal_Int32 column) override; + virtual sal_Bool SAL_CALL isSearchable(sal_Int32 column) override; + virtual sal_Bool SAL_CALL isCurrency(sal_Int32 column) override; + virtual sal_Int32 SAL_CALL isNullable(sal_Int32 column) override; + virtual sal_Bool SAL_CALL isSigned(sal_Int32 column) override; + virtual sal_Int32 SAL_CALL getColumnDisplaySize(sal_Int32 column) override; + virtual ::rtl::OUString SAL_CALL getColumnLabel(sal_Int32 column) override; + virtual ::rtl::OUString SAL_CALL getColumnName(sal_Int32 column) override; + virtual ::rtl::OUString SAL_CALL getSchemaName(sal_Int32 column) override; + virtual sal_Int32 SAL_CALL getPrecision(sal_Int32 column) override; + virtual sal_Int32 SAL_CALL getScale(sal_Int32 column) override; + virtual ::rtl::OUString SAL_CALL getTableName(sal_Int32 column) override; + virtual ::rtl::OUString SAL_CALL getCatalogName(sal_Int32 column) override; + virtual sal_Int32 SAL_CALL getColumnType(sal_Int32 column) override; + virtual ::rtl::OUString SAL_CALL getColumnTypeName(sal_Int32 column) override; + virtual sal_Bool SAL_CALL isReadOnly(sal_Int32 column) override; + virtual sal_Bool SAL_CALL isWritable(sal_Int32 column) override; + virtual sal_Bool SAL_CALL isDefinitelyWritable(sal_Int32 column) override; + virtual ::rtl::OUString SAL_CALL getColumnServiceName(sal_Int32 column) override; }; } } diff --git a/connectivity/source/drivers/firebird/Statement.cxx b/connectivity/source/drivers/firebird/Statement.cxx index a13414ca268e..8ec604760251 100644 --- a/connectivity/source/drivers/firebird/Statement.cxx +++ b/connectivity/source/drivers/firebird/Statement.cxx @@ -52,16 +52,15 @@ using namespace ::std; // ---- XBatchExecution - UNSUPPORTED ---------------------------------------- void SAL_CALL OStatement::addBatch(const OUString& sql) - throw(SQLException, RuntimeException, std::exception) { (void) sql; } -void SAL_CALL OStatement::clearBatch() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OStatement::clearBatch() { } -Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch() throw(SQLException, RuntimeException, std::exception) +Sequence< sal_Int32 > SAL_CALL OStatement::executeBatch() { return Sequence< sal_Int32 >(); } @@ -95,7 +94,6 @@ void OStatement::disposeResultSet() // ---- XStatement ----------------------------------------------------------- sal_Int32 SAL_CALL OStatement::executeUpdate(const OUString& sql) - throw(SQLException, RuntimeException, std::exception) { execute(sql); return getStatementChangeCount(); @@ -103,7 +101,6 @@ sal_Int32 SAL_CALL OStatement::executeUpdate(const OUString& sql) uno::Reference< XResultSet > SAL_CALL OStatement::executeQuery(const OUString& sql) - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); @@ -149,7 +146,6 @@ uno::Reference< XResultSet > SAL_CALL OStatement::executeQuery(const OUString& s } sal_Bool SAL_CALL OStatement::execute(const OUString& sql) - throw(SQLException, RuntimeException, std::exception) { uno::Reference< XResultSet > xResults = executeQuery(sql); return xResults.is(); @@ -157,7 +153,6 @@ sal_Bool SAL_CALL OStatement::execute(const OUString& sql) } uno::Reference< XConnection > SAL_CALL OStatement::getConnection() - throw(SQLException, RuntimeException, std::exception) { MutexGuard aGuard(m_aMutex); checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); @@ -165,7 +160,7 @@ uno::Reference< XConnection > SAL_CALL OStatement::getConnection() return uno::Reference(m_pConnection.get()); } -Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OStatement::queryInterface( const Type & rType ) { Any aRet = OStatement_Base::queryInterface(rType); if(!aRet.hasValue()) @@ -176,7 +171,6 @@ Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeExcep } uno::Sequence< Type > SAL_CALL OStatement::getTypes() - throw(RuntimeException, std::exception) { return concatSequences(OStatement_Base::getTypes(), OStatementCommonBase::getTypes()); diff --git a/connectivity/source/drivers/firebird/Statement.hxx b/connectivity/source/drivers/firebird/Statement.hxx index 308d2f9ae478..248a2a65fb1a 100644 --- a/connectivity/source/drivers/firebird/Statement.hxx +++ b/connectivity/source/drivers/firebird/Statement.hxx @@ -58,31 +58,25 @@ namespace connectivity // XStatement virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL - executeQuery(const ::rtl::OUString& sql) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL executeUpdate(const ::rtl::OUString& sqlIn) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + executeQuery(const ::rtl::OUString& sql) override; + virtual sal_Int32 SAL_CALL executeUpdate(const ::rtl::OUString& sqlIn) override; virtual sal_Bool SAL_CALL - execute(const ::rtl::OUString& sql) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + execute(const ::rtl::OUString& sql) override; virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL - getConnection() - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + getConnection() override; // XBatchExecution - UNSUPPORTED - virtual void SAL_CALL addBatch( const ::rtl::OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearBatch( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int32 > SAL_CALL executeBatch( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL addBatch( const ::rtl::OUString& sql ) override; + virtual void SAL_CALL clearBatch( ) override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL executeBatch( ) override; // XInterface virtual css::uno::Any SAL_CALL - queryInterface(const css::uno::Type & rType) - throw(css::uno::RuntimeException, std::exception) override; + queryInterface(const css::uno::Type & rType) override; //XTypeProvider virtual css::uno::Sequence< css::uno::Type > SAL_CALL - getTypes() - throw(css::uno::RuntimeException, std::exception) override; + getTypes() override; // OComponentHelper virtual void SAL_CALL disposing() override; diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.cxx b/connectivity/source/drivers/firebird/StatementCommonBase.cxx index bd1c4b7f23d1..1cf44a849636 100644 --- a/connectivity/source/drivers/firebird/StatementCommonBase.cxx +++ b/connectivity/source/drivers/firebird/StatementCommonBase.cxx @@ -68,7 +68,6 @@ void OStatementCommonBase::disposeResultSet() } void OStatementCommonBase::freeStatementHandle() - throw (SQLException) { if (m_aStatementHandle) { @@ -82,7 +81,7 @@ void OStatementCommonBase::freeStatementHandle() } -Any SAL_CALL OStatementCommonBase::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OStatementCommonBase::queryInterface( const Type & rType ) { Any aRet = OStatementCommonBase_Base::queryInterface(rType); if(!aRet.hasValue()) @@ -90,7 +89,7 @@ Any SAL_CALL OStatementCommonBase::queryInterface( const Type & rType ) throw(Ru return aRet; } -Sequence< Type > SAL_CALL OStatementCommonBase::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL OStatementCommonBase::getTypes( ) { ::cppu::OTypeCollection aTypes( ::cppu::UnoType::get(), @@ -101,7 +100,7 @@ Sequence< Type > SAL_CALL OStatementCommonBase::getTypes( ) throw(RuntimeExcept } -void SAL_CALL OStatementCommonBase::cancel( ) throw(RuntimeException, std::exception) +void SAL_CALL OStatementCommonBase::cancel( ) { MutexGuard aGuard(m_aMutex); checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); @@ -109,7 +108,6 @@ void SAL_CALL OStatementCommonBase::cancel( ) throw(RuntimeException, std::exce } void SAL_CALL OStatementCommonBase::close() - throw(SQLException, RuntimeException, std::exception) { SAL_INFO("connectivity.firebird", "close"); @@ -126,7 +124,6 @@ void SAL_CALL OStatementCommonBase::close() void OStatementCommonBase::prepareAndDescribeStatement(const OUString& sql, XSQLDA*& pOutSqlda, XSQLDA* pInSqlda) - throw (SQLException) { MutexGuard aGuard(m_aMutex); @@ -223,7 +220,7 @@ void OStatementCommonBase::prepareAndDescribeStatement(const OUString& sql, } // ---- XMultipleResults - UNSUPPORTED ---------------------------------------- -uno::Reference< XResultSet > SAL_CALL OStatementCommonBase::getResultSet() throw(SQLException, RuntimeException, std::exception) +uno::Reference< XResultSet > SAL_CALL OStatementCommonBase::getResultSet() { // TODO: verify we really can't support this // return uno::Reference< XResultSet >(); @@ -233,7 +230,7 @@ uno::Reference< XResultSet > SAL_CALL OStatementCommonBase::getResultSet() throw return m_xResultSet; } -sal_Bool SAL_CALL OStatementCommonBase::getMoreResults() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OStatementCommonBase::getMoreResults() { // TODO: verify we really can't support this return false; @@ -241,7 +238,7 @@ sal_Bool SAL_CALL OStatementCommonBase::getMoreResults() throw(SQLException, Run // checkDisposed(OStatementCommonBase_Base::rBHelper.bDisposed); } -sal_Int32 SAL_CALL OStatementCommonBase::getUpdateCount() throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OStatementCommonBase::getUpdateCount() { // TODO: verify we really can't support this return 0; @@ -249,12 +246,12 @@ sal_Int32 SAL_CALL OStatementCommonBase::getUpdateCount() throw(SQLException, Ru // ---- XWarningsSupplier - UNSUPPORTED ---------------------------------------- -Any SAL_CALL OStatementCommonBase::getWarnings() throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OStatementCommonBase::getWarnings() { return Any(); } -void SAL_CALL OStatementCommonBase::clearWarnings() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OStatementCommonBase::clearWarnings() { } @@ -300,7 +297,6 @@ sal_Bool OStatementCommonBase::convertFastPropertyValue( Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) - throw (IllegalArgumentException) { (void) rConvertedValue; (void) rOldValue; @@ -311,7 +307,7 @@ sal_Bool OStatementCommonBase::convertFastPropertyValue( return bConverted; } -void OStatementCommonBase::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception, std::exception) +void OStatementCommonBase::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) { (void) rValue; // set the value to what ever is necessary @@ -362,13 +358,12 @@ void SAL_CALL OStatementCommonBase::release() throw() OStatementCommonBase_Base::release(); } -uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OStatementCommonBase::getPropertySetInfo( ) throw(RuntimeException, std::exception) +uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OStatementCommonBase::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } short OStatementCommonBase::getSqlInfoItem(char aInfoItem) - throw (SQLException) { ISC_STATUS_ARRAY aStatusVector; ISC_STATUS aErr; @@ -396,7 +391,6 @@ short OStatementCommonBase::getSqlInfoItem(char aInfoItem) } bool OStatementCommonBase::isDDLStatement() - throw (SQLException) { if (getSqlInfoItem(isc_info_sql_stmt_type) == isc_info_sql_stmt_ddl) return true; @@ -405,7 +399,6 @@ bool OStatementCommonBase::isDDLStatement() } sal_Int32 OStatementCommonBase::getStatementChangeCount() - throw (SQLException) { const short aStatementType = getSqlInfoItem(isc_info_sql_stmt_type); diff --git a/connectivity/source/drivers/firebird/StatementCommonBase.hxx b/connectivity/source/drivers/firebird/StatementCommonBase.hxx index 11d9c3dab52b..856ebc807ff9 100644 --- a/connectivity/source/drivers/firebird/StatementCommonBase.hxx +++ b/connectivity/source/drivers/firebird/StatementCommonBase.hxx @@ -66,8 +66,7 @@ namespace connectivity protected: virtual void disposeResultSet(); /// @throws css::sdbc::SQLException - void freeStatementHandle() - throw (css::sdbc::SQLException); + void freeStatementHandle(); // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const override; @@ -78,11 +77,10 @@ namespace connectivity css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, - const css::uno::Any& rValue ) - throw (css::lang::IllegalArgumentException) override; + const css::uno::Any& rValue ) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const css::uno::Any& rValue) throw (css::uno::Exception, std::exception) override; + const css::uno::Any& rValue) override; virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle) const override; @@ -91,18 +89,14 @@ namespace connectivity /// @throws css::sdbc::SQLException void prepareAndDescribeStatement(const OUString& sqlIn, XSQLDA*& pOutSqlda, - XSQLDA* pInSqlda=nullptr) - throw (css::sdbc::SQLException); + XSQLDA* pInSqlda=nullptr); /// @throws css::sdbc::SQLException - short getSqlInfoItem(char aInfoItem) - throw (css::sdbc::SQLException); + short getSqlInfoItem(char aInfoItem); /// @throws css::sdbc::SQLException - bool isDDLStatement() - throw (css::sdbc::SQLException); + bool isDDLStatement(); /// @throws css::sdbc::SQLException - sal_Int32 getStatementChangeCount() - throw (css::sdbc::SQLException); + sal_Int32 getStatementChangeCount(); public: @@ -118,25 +112,25 @@ namespace connectivity virtual void SAL_CALL release() throw() override; virtual void SAL_CALL acquire() throw() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; //XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; // XWarningsSupplier - UNSUPPORTED - virtual css::uno::Any SAL_CALL getWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getWarnings( ) override; + virtual void SAL_CALL clearWarnings( ) override; // XMultipleResults - UNSUPPORTED - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getUpdateCount( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getMoreResults( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet( ) override; + virtual sal_Int32 SAL_CALL getUpdateCount( ) override; + virtual sal_Bool SAL_CALL getMoreResults( ) override; // XCancellable - virtual void SAL_CALL cancel( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cancel( ) override; // XCloseable - virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) override; }; } diff --git a/connectivity/source/drivers/firebird/SubComponent.hxx b/connectivity/source/drivers/firebird/SubComponent.hxx index 9a6739e59a45..ea03c6512b6f 100644 --- a/connectivity/source/drivers/firebird/SubComponent.hxx +++ b/connectivity/source/drivers/firebird/SubComponent.hxx @@ -56,7 +56,7 @@ namespace connectivity css::lang::XComponent* _pObject); /// @throws css::lang::DisposedException - void checkDisposed(bool _bThrow) throw ( css::lang::DisposedException ); + void checkDisposed(bool _bThrow); template diff --git a/connectivity/source/drivers/firebird/Table.cxx b/connectivity/source/drivers/firebird/Table.cxx index fea904630ffb..7f71d1ebfbac 100644 --- a/connectivity/source/drivers/firebird/Table.cxx +++ b/connectivity/source/drivers/firebird/Table.cxx @@ -112,7 +112,6 @@ OCollection* Table::createIndexes(const TStringVector& rNames) //----- XAlterTable ----------------------------------------------------------- void SAL_CALL Table::alterColumnByName(const OUString& rColName, const uno::Reference< XPropertySet >& rDescriptor) - throw(SQLException, NoSuchElementException, RuntimeException, std::exception) { MutexGuard aGuard(m_rMutex); checkDisposed(WeakComponentImplHelperBase::rBHelper.bDisposed); @@ -223,7 +222,6 @@ void SAL_CALL Table::alterColumnByName(const OUString& rColName, // ----- XRename -------------------------------------------------------------- void SAL_CALL Table::rename(const OUString& rName) - throw(SQLException, ElementExistException, RuntimeException, std::exception) { (void) rName; throw RuntimeException(); // Firebird doesn't support this. @@ -231,7 +229,6 @@ void SAL_CALL Table::rename(const OUString& rName) // ----- XInterface ----------------------------------------------------------- Any SAL_CALL Table::queryInterface(const Type& rType) - throw(RuntimeException, std::exception) { if (rType.getTypeName() == "com.sun.star.sdbcx.XRename") return Any(); @@ -241,7 +238,6 @@ Any SAL_CALL Table::queryInterface(const Type& rType) // ----- XTypeProvider -------------------------------------------------------- uno::Sequence< Type > SAL_CALL Table::getTypes() - throw(RuntimeException, std::exception) { uno::Sequence< Type > aTypes = OTableHelper::getTypes(); diff --git a/connectivity/source/drivers/firebird/Table.hxx b/connectivity/source/drivers/firebird/Table.hxx index 7ea9f48734f8..c1bcc161674b 100644 --- a/connectivity/source/drivers/firebird/Table.hxx +++ b/connectivity/source/drivers/firebird/Table.hxx @@ -64,26 +64,18 @@ namespace connectivity */ virtual void SAL_CALL alterColumnByName( const ::rtl::OUString& rColName, - const css::uno::Reference< css::beans::XPropertySet >& rDescriptor) - throw(css::sdbc::SQLException, - css::container::NoSuchElementException, - css::uno::RuntimeException, std::exception) override; + const css::uno::Reference< css::beans::XPropertySet >& rDescriptor) override; // XRename -- UNSUPPORTED - virtual void SAL_CALL rename(const ::rtl::OUString& sName) - throw(css::sdbc::SQLException, - css::container::ElementExistException, - css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL rename(const ::rtl::OUString& sName) override; //XInterface virtual css::uno::Any - SAL_CALL queryInterface(const css::uno::Type & rType) - throw(css::uno::RuntimeException, std::exception) override; + SAL_CALL queryInterface(const css::uno::Type & rType) override; //XTypeProvider virtual css::uno::Sequence< css::uno::Type > - SAL_CALL getTypes() - throw(css::uno::RuntimeException, std::exception) override; + SAL_CALL getTypes() override; }; diff --git a/connectivity/source/drivers/firebird/Tables.cxx b/connectivity/source/drivers/firebird/Tables.cxx index bc15f9040e46..2643a7aa7a0c 100644 --- a/connectivity/source/drivers/firebird/Tables.cxx +++ b/connectivity/source/drivers/firebird/Tables.cxx @@ -36,7 +36,6 @@ using namespace ::com::sun::star::uno; //----- OCollection ----------------------------------------------------------- void Tables::impl_refresh() - throw(RuntimeException) { static_cast(m_rParent).refreshTables(); } diff --git a/connectivity/source/drivers/firebird/Tables.hxx b/connectivity/source/drivers/firebird/Tables.hxx index 1a0a3580efd7..e106b8b65c4d 100644 --- a/connectivity/source/drivers/firebird/Tables.hxx +++ b/connectivity/source/drivers/firebird/Tables.hxx @@ -32,8 +32,7 @@ namespace connectivity static OUString createStandardColumnPart(const css::uno::Reference< css::beans::XPropertySet >& xColProp,const css::uno::Reference< com::sun::star::sdbc::XConnection>& _xConnection); // OCollection - virtual void impl_refresh() - throw(css::uno::RuntimeException) override; + virtual void impl_refresh() override; virtual ::connectivity::sdbcx::ObjectType createObject( const ::rtl::OUString& rName) override; virtual css::uno::Reference< css::beans::XPropertySet > diff --git a/connectivity/source/drivers/firebird/Users.cxx b/connectivity/source/drivers/firebird/Users.cxx index 4316a5814039..832872c51e66 100644 --- a/connectivity/source/drivers/firebird/Users.cxx +++ b/connectivity/source/drivers/firebird/Users.cxx @@ -41,7 +41,6 @@ Users::Users(const uno::Reference< XDatabaseMetaData >& rMetaData, //----- OCollection ----------------------------------------------------------- void Users::impl_refresh() - throw(RuntimeException) { // TODO: IMPLEMENT ME } diff --git a/connectivity/source/drivers/firebird/Users.hxx b/connectivity/source/drivers/firebird/Users.hxx index 975bd1376263..75ba14499eb5 100644 --- a/connectivity/source/drivers/firebird/Users.hxx +++ b/connectivity/source/drivers/firebird/Users.hxx @@ -29,8 +29,7 @@ namespace connectivity m_xMetaData; // OCollection - virtual void impl_refresh() - throw(css::uno::RuntimeException) override; + virtual void impl_refresh() override; virtual ::connectivity::sdbcx::ObjectType createObject( const ::rtl::OUString& rName) override; virtual css::uno::Reference< css::beans::XPropertySet > diff --git a/connectivity/source/drivers/firebird/Util.cxx b/connectivity/source/drivers/firebird/Util.cxx index 7d72900a4788..bd84bba0c9a9 100644 --- a/connectivity/source/drivers/firebird/Util.cxx +++ b/connectivity/source/drivers/firebird/Util.cxx @@ -56,7 +56,6 @@ OUString firebird::StatusVectorToString(const ISC_STATUS_ARRAY& rStatusVector, void firebird::evaluateStatusVector(const ISC_STATUS_ARRAY& rStatusVector, const OUString& rCause, const uno::Reference< XInterface >& _rxContext) - throw(SQLException) { if (IndicatesError(rStatusVector)) { diff --git a/connectivity/source/drivers/firebird/Util.hxx b/connectivity/source/drivers/firebird/Util.hxx index c66ecd7d1209..b37b8718e9b8 100644 --- a/connectivity/source/drivers/firebird/Util.hxx +++ b/connectivity/source/drivers/firebird/Util.hxx @@ -60,8 +60,7 @@ namespace connectivity */ void evaluateStatusVector(const ISC_STATUS_ARRAY& rStatusVector, const ::rtl::OUString& aCause, - const css::uno::Reference< css::uno::XInterface >& _rxContext) - throw (css::sdbc::SQLException); + const css::uno::Reference< css::uno::XInterface >& _rxContext); sal_Int32 getColumnTypeFromFBType(short aType, short aSubType); ::rtl::OUString getColumnTypeNameFromFBType(short aType, short aSubType); diff --git a/connectivity/source/drivers/flat/EConnection.cxx b/connectivity/source/drivers/flat/EConnection.cxx index 748bdae64f54..dcd6e689b19f 100644 --- a/connectivity/source/drivers/flat/EConnection.cxx +++ b/connectivity/source/drivers/flat/EConnection.cxx @@ -60,7 +60,6 @@ IMPLEMENT_SERVICE_INFO(OFlatConnection, "com.sun.star.sdbc.drivers.flat.Connecti void OFlatConnection::construct(const OUString& url,const Sequence< PropertyValue >& info) - throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { osl_atomic_increment( &m_refCount ); @@ -105,7 +104,7 @@ void OFlatConnection::construct(const OUString& url,const Sequence< PropertyValu m_bShowDeleted = true; // we do not supported rows for this type } -Reference< XDatabaseMetaData > SAL_CALL OFlatConnection::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XDatabaseMetaData > SAL_CALL OFlatConnection::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_B::rBHelper.bDisposed); @@ -134,7 +133,7 @@ css::uno::Reference< XTablesSupplier > OFlatConnection::createCatalog() return xTab; } -Reference< XStatement > SAL_CALL OFlatConnection::createStatement( ) throw(SQLException, RuntimeException, std::exception) +Reference< XStatement > SAL_CALL OFlatConnection::createStatement( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_B::rBHelper.bDisposed); @@ -146,7 +145,7 @@ Reference< XStatement > SAL_CALL OFlatConnection::createStatement( ) throw(SQLE return xStmt; } -Reference< XPreparedStatement > SAL_CALL OFlatConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +Reference< XPreparedStatement > SAL_CALL OFlatConnection::prepareStatement( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_B::rBHelper.bDisposed); @@ -160,7 +159,7 @@ Reference< XPreparedStatement > SAL_CALL OFlatConnection::prepareStatement( cons return xStmt; } -Reference< XPreparedStatement > SAL_CALL OFlatConnection::prepareCall( const OUString& /*sql*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XPreparedStatement > SAL_CALL OFlatConnection::prepareCall( const OUString& /*sql*/ ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_B::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx index fe5d88f64cab..a1a80ff0d14d 100644 --- a/connectivity/source/drivers/flat/EDatabaseMetaData.cxx +++ b/connectivity/source/drivers/flat/EDatabaseMetaData.cxx @@ -148,7 +148,7 @@ Reference< XResultSet > OFlatDatabaseMetaData::impl_getTypeInfo_throw( ) Reference< XResultSet > SAL_CALL OFlatDatabaseMetaData::getColumns( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern, - const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception) + const OUString& columnNamePattern ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -236,7 +236,7 @@ Reference< XResultSet > SAL_CALL OFlatDatabaseMetaData::getColumns( return xRef; } -OUString SAL_CALL OFlatDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OFlatDatabaseMetaData::getURL( ) { ::osl::MutexGuard aGuard( m_aMutex ); return "sdbc:flat:" + m_pConnection->getURL(); diff --git a/connectivity/source/drivers/flat/EDriver.cxx b/connectivity/source/drivers/flat/EDriver.cxx index 6fdc55c73882..1219f46cf7b8 100644 --- a/connectivity/source/drivers/flat/EDriver.cxx +++ b/connectivity/source/drivers/flat/EDriver.cxx @@ -38,24 +38,24 @@ using namespace css::lang; // static ServiceInfo -OUString ODriver::getImplementationName_Static( ) throw(RuntimeException) +OUString ODriver::getImplementationName_Static( ) { return OUString("com.sun.star.comp.sdbc.flat.ODriver"); } -OUString SAL_CALL ODriver::getImplementationName( ) throw(RuntimeException, std::exception) +OUString SAL_CALL ODriver::getImplementationName( ) { return getImplementationName_Static(); } -css::uno::Reference< css::uno::XInterface > SAL_CALL connectivity::flat::ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception ) +css::uno::Reference< css::uno::XInterface > SAL_CALL connectivity::flat::ODriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) { return *(new ODriver( comphelper::getComponentContext(_rxFactory) )); } -Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) { ::osl::MutexGuard aGuard( m_aMutex ); if (ODriver_BASE::rBHelper.bDisposed) @@ -73,12 +73,11 @@ Reference< XConnection > SAL_CALL ODriver::connect( const OUString& url, const S } sal_Bool SAL_CALL ODriver::acceptsURL( const OUString& url ) - throw(SQLException, RuntimeException, std::exception) { return url.startsWith("sdbc:flat:"); } -Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException, std::exception) +Sequence< DriverPropertyInfo > SAL_CALL ODriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& info ) { if ( acceptsURL(url) ) { diff --git a/connectivity/source/drivers/flat/EResultSet.cxx b/connectivity/source/drivers/flat/EResultSet.cxx index 4a8c37900198..60e0e851e465 100644 --- a/connectivity/source/drivers/flat/EResultSet.cxx +++ b/connectivity/source/drivers/flat/EResultSet.cxx @@ -44,12 +44,12 @@ OFlatResultSet::OFlatResultSet( OStatement_Base* pStmt,connectivity::OSQLParseTr registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISBOOKMARKABLE), PROPERTY_ID_ISBOOKMARKABLE, PropertyAttribute::READONLY,&m_bBookmarkable, cppu::UnoType::get()); } -OUString SAL_CALL OFlatResultSet::getImplementationName( ) throw ( RuntimeException, std::exception) +OUString SAL_CALL OFlatResultSet::getImplementationName( ) { return OUString("com.sun.star.sdbcx.flat.ResultSet"); } -Sequence< OUString > SAL_CALL OFlatResultSet::getSupportedServiceNames( ) throw( RuntimeException, std::exception) +Sequence< OUString > SAL_CALL OFlatResultSet::getSupportedServiceNames( ) { Sequence< OUString > aSupported(2); aSupported[0] = "com.sun.star.sdbc.ResultSet"; @@ -57,12 +57,12 @@ Sequence< OUString > SAL_CALL OFlatResultSet::getSupportedServiceNames( ) throw return aSupported; } -sal_Bool SAL_CALL OFlatResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException, std::exception) +sal_Bool SAL_CALL OFlatResultSet::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } -Any SAL_CALL OFlatResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OFlatResultSet::queryInterface( const Type & rType ) { if(rType == cppu::UnoType::get()|| rType == cppu::UnoType::get() || rType == cppu::UnoType::get()) @@ -72,7 +72,7 @@ Any SAL_CALL OFlatResultSet::queryInterface( const Type & rType ) throw(RuntimeE return aRet.hasValue() ? aRet : OFlatResultSet_BASE::queryInterface(rType); } -Sequence< Type > SAL_CALL OFlatResultSet::getTypes( ) throw( RuntimeException, std::exception) +Sequence< Type > SAL_CALL OFlatResultSet::getTypes( ) { Sequence< Type > aTypes = OResultSet::getTypes(); ::std::vector aOwnTypes; @@ -94,7 +94,7 @@ Sequence< Type > SAL_CALL OFlatResultSet::getTypes( ) throw( RuntimeException, // XRowLocate -Any SAL_CALL OFlatResultSet::getBookmark( ) throw( SQLException, RuntimeException, std::exception) +Any SAL_CALL OFlatResultSet::getBookmark( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -102,7 +102,7 @@ Any SAL_CALL OFlatResultSet::getBookmark( ) throw( SQLException, RuntimeExcept return makeAny((sal_Int32)(m_aRow->get())[0]->getValue()); } -sal_Bool SAL_CALL OFlatResultSet::moveToBookmark( const Any& bookmark ) throw( SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OFlatResultSet::moveToBookmark( const Any& bookmark ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -113,7 +113,7 @@ sal_Bool SAL_CALL OFlatResultSet::moveToBookmark( const Any& bookmark ) throw( return Move(IResultSetHelper::BOOKMARK,comphelper::getINT32(bookmark),true); } -sal_Bool SAL_CALL OFlatResultSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) throw( SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OFlatResultSet::moveRelativeToBookmark( const Any& bookmark, sal_Int32 rows ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -127,17 +127,17 @@ sal_Bool SAL_CALL OFlatResultSet::moveRelativeToBookmark( const Any& bookmark, } -sal_Int32 SAL_CALL OFlatResultSet::compareBookmarks( const Any& lhs, const Any& rhs ) throw( SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OFlatResultSet::compareBookmarks( const Any& lhs, const Any& rhs ) { return (lhs == rhs) ? CompareBookmark::EQUAL : CompareBookmark::NOT_EQUAL; } -sal_Bool SAL_CALL OFlatResultSet::hasOrderedBookmarks( ) throw( SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OFlatResultSet::hasOrderedBookmarks( ) { return true; } -sal_Int32 SAL_CALL OFlatResultSet::hashBookmark( const Any& bookmark ) throw( SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OFlatResultSet::hashBookmark( const Any& bookmark ) { return comphelper::getINT32(bookmark); } @@ -164,7 +164,7 @@ void SAL_CALL OFlatResultSet::release() throw() OFlatResultSet_BASE2::release(); } -css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OFlatResultSet::getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OFlatResultSet::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/flat/ETable.cxx b/connectivity/source/drivers/flat/ETable.cxx index 21b20cbcb943..fea263b95ccf 100644 --- a/connectivity/source/drivers/flat/ETable.cxx +++ b/connectivity/source/drivers/flat/ETable.cxx @@ -516,7 +516,7 @@ void SAL_CALL OFlatTable::disposing() m_aColumns = nullptr; } -Sequence< Type > SAL_CALL OFlatTable::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL OFlatTable::getTypes( ) { Sequence< Type > aTypes = OTable_TYPEDEF::getTypes(); vector aOwnTypes; @@ -538,7 +538,7 @@ Sequence< Type > SAL_CALL OFlatTable::getTypes( ) throw(RuntimeException, std:: } -Any SAL_CALL OFlatTable::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OFlatTable::queryInterface( const Type & rType ) { if( rType == cppu::UnoType::get()|| rType == cppu::UnoType::get()|| @@ -569,7 +569,7 @@ Sequence< sal_Int8 > OFlatTable::getUnoTunnelImplementationId() // css::lang::XUnoTunnel -sal_Int64 OFlatTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception) +sal_Int64 OFlatTable::getSomething( const Sequence< sal_Int8 > & rId ) { return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) ? reinterpret_cast< sal_Int64 >( this ) diff --git a/connectivity/source/drivers/hsqldb/HCatalog.cxx b/connectivity/source/drivers/hsqldb/HCatalog.cxx index a3baf0f021d5..a17eedd41f10 100644 --- a/connectivity/source/drivers/hsqldb/HCatalog.cxx +++ b/connectivity/source/drivers/hsqldb/HCatalog.cxx @@ -121,7 +121,7 @@ void OHCatalog::refreshUsers() m_pUsers = new OUsers(*this,m_aMutex,aVector,m_xConnection,this); } -Any SAL_CALL OHCatalog::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OHCatalog::queryInterface( const Type & rType ) { if ( rType == cppu::UnoType::get()) return Any(); @@ -129,7 +129,7 @@ Any SAL_CALL OHCatalog::queryInterface( const Type & rType ) throw(RuntimeExcept return OCatalog::queryInterface(rType); } -Sequence< Type > SAL_CALL OHCatalog::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL OHCatalog::getTypes( ) { Sequence< Type > aTypes = OCatalog::getTypes(); ::std::vector aOwnTypes; diff --git a/connectivity/source/drivers/hsqldb/HColumns.cxx b/connectivity/source/drivers/hsqldb/HColumns.cxx index a63d829c9f9d..2aae09029ad9 100644 --- a/connectivity/source/drivers/hsqldb/HColumns.cxx +++ b/connectivity/source/drivers/hsqldb/HColumns.cxx @@ -67,7 +67,7 @@ void OHSQLColumn::construct() return *OHSQLColumn_PROP::getArrayHelper(isNew() ? 1 : 0); } -Sequence< OUString > SAL_CALL OHSQLColumn::getSupportedServiceNames( ) throw(RuntimeException, std::exception) +Sequence< OUString > SAL_CALL OHSQLColumn::getSupportedServiceNames( ) { Sequence< OUString > aSupported { "com.sun.star.sdbcx.Column" }; diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx index ff9a98c0e082..7f7032525ae5 100644 --- a/connectivity/source/drivers/hsqldb/HConnection.cxx +++ b/connectivity/source/drivers/hsqldb/HConnection.cxx @@ -121,7 +121,7 @@ namespace connectivity { namespace hsqldb // XFlushable - void SAL_CALL OHsqlConnection::flush( ) throw (RuntimeException, std::exception) + void SAL_CALL OHsqlConnection::flush( ) { MethodGuard aGuard( *this ); @@ -166,21 +166,21 @@ namespace connectivity { namespace hsqldb } - void SAL_CALL OHsqlConnection::addFlushListener( const Reference< XFlushListener >& l ) throw (RuntimeException, std::exception) + void SAL_CALL OHsqlConnection::addFlushListener( const Reference< XFlushListener >& l ) { MethodGuard aGuard( *this ); m_aFlushListeners.addInterface( l ); } - void SAL_CALL OHsqlConnection::removeFlushListener( const Reference< XFlushListener >& l ) throw (RuntimeException, std::exception) + void SAL_CALL OHsqlConnection::removeFlushListener( const Reference< XFlushListener >& l ) { MethodGuard aGuard( *this ); m_aFlushListeners.removeInterface( l ); } - Reference< XGraphic > SAL_CALL OHsqlConnection::getTableIcon( const OUString& TableName, ::sal_Int32 /*_ColorMode*/ ) throw (RuntimeException, std::exception) + Reference< XGraphic > SAL_CALL OHsqlConnection::getTableIcon( const OUString& TableName, ::sal_Int32 /*_ColorMode*/ ) { MethodGuard aGuard( *this ); @@ -192,7 +192,7 @@ namespace connectivity { namespace hsqldb } - Reference< XInterface > SAL_CALL OHsqlConnection::getTableEditor( const Reference< XDatabaseDocumentUI >& DocumentUI, const OUString& TableName ) throw (IllegalArgumentException, WrappedTargetException, RuntimeException, std::exception) + Reference< XInterface > SAL_CALL OHsqlConnection::getTableEditor( const Reference< XDatabaseDocumentUI >& DocumentUI, const OUString& TableName ) { MethodGuard aGuard( *this ); diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx index af24d3190e4f..ba542ff972d0 100644 --- a/connectivity/source/drivers/hsqldb/HDriver.cxx +++ b/connectivity/source/drivers/hsqldb/HDriver.cxx @@ -75,7 +75,7 @@ namespace connectivity namespace hsqldb { - Reference< XInterface > SAL_CALL ODriverDelegator_CreateInstance(const Reference< css::lang::XMultiServiceFactory >& _rxFac) throw( Exception ) + Reference< XInterface > SAL_CALL ODriverDelegator_CreateInstance(const Reference< css::lang::XMultiServiceFactory >& _rxFac) { return *(new ODriverDelegator(comphelper::getComponentContext(_rxFac))); } @@ -168,7 +168,7 @@ namespace connectivity } - Reference< XConnection > SAL_CALL ODriverDelegator::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException, std::exception) + Reference< XConnection > SAL_CALL ODriverDelegator::connect( const OUString& url, const Sequence< PropertyValue >& info ) { Reference< XConnection > xConnection; if ( acceptsURL(url) ) @@ -382,7 +382,7 @@ namespace connectivity } - sal_Bool SAL_CALL ODriverDelegator::acceptsURL( const OUString& url ) throw (SQLException, RuntimeException, std::exception) + sal_Bool SAL_CALL ODriverDelegator::acceptsURL( const OUString& url ) { sal_Bool bEnabled = false; javaFrameworkError e = jfw_getEnabled(&bEnabled); @@ -404,7 +404,7 @@ namespace connectivity } - Sequence< DriverPropertyInfo > SAL_CALL ODriverDelegator::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw (SQLException, RuntimeException, std::exception) + Sequence< DriverPropertyInfo > SAL_CALL ODriverDelegator::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) { if ( !acceptsURL(url) ) return Sequence< DriverPropertyInfo >(); @@ -434,19 +434,19 @@ namespace connectivity } - sal_Int32 SAL_CALL ODriverDelegator::getMajorVersion( ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL ODriverDelegator::getMajorVersion( ) { return 1; } - sal_Int32 SAL_CALL ODriverDelegator::getMinorVersion( ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL ODriverDelegator::getMinorVersion( ) { return 0; } - Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByConnection( const Reference< XConnection >& connection ) throw (SQLException, RuntimeException, std::exception) + Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByConnection( const Reference< XConnection >& connection ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODriverDelegator_BASE::rBHelper.bDisposed); @@ -472,7 +472,7 @@ namespace connectivity } - Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException, std::exception) + Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) { if ( ! acceptsURL(url) ) { @@ -487,12 +487,12 @@ namespace connectivity // XServiceInfo - OUString ODriverDelegator::getImplementationName_Static( ) throw(RuntimeException) + OUString ODriverDelegator::getImplementationName_Static( ) { return OUString("com.sun.star.sdbcx.comp.hsqldb.Driver"); } - Sequence< OUString > ODriverDelegator::getSupportedServiceNames_Static( ) throw (RuntimeException) + Sequence< OUString > ODriverDelegator::getSupportedServiceNames_Static( ) { Sequence< OUString > aSNS( 2 ); aSNS[0] = "com.sun.star.sdbc.Driver"; @@ -500,22 +500,22 @@ namespace connectivity return aSNS; } - OUString SAL_CALL ODriverDelegator::getImplementationName( ) throw(RuntimeException, std::exception) + OUString SAL_CALL ODriverDelegator::getImplementationName( ) { return getImplementationName_Static(); } - sal_Bool SAL_CALL ODriverDelegator::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) + sal_Bool SAL_CALL ODriverDelegator::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } - Sequence< OUString > SAL_CALL ODriverDelegator::getSupportedServiceNames( ) throw(RuntimeException, std::exception) + Sequence< OUString > SAL_CALL ODriverDelegator::getSupportedServiceNames( ) { return getSupportedServiceNames_Static(); } - void SAL_CALL ODriverDelegator::createCatalog( const Sequence< PropertyValue >& /*info*/ ) throw (SQLException, css::container::ElementExistException, RuntimeException, std::exception) + void SAL_CALL ODriverDelegator::createCatalog( const Sequence< PropertyValue >& /*info*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XCreateCatalog::createCatalog", *this ); } @@ -555,7 +555,7 @@ namespace connectivity m_aConnections.erase(_aIter); } - void SAL_CALL ODriverDelegator::disposing( const css::lang::EventObject& Source ) throw(css::uno::RuntimeException, std::exception) + void SAL_CALL ODriverDelegator::disposing( const css::lang::EventObject& Source ) { ::osl::MutexGuard aGuard(m_aMutex); Reference xCon(Source.Source,UNO_QUERY); @@ -625,7 +625,7 @@ namespace connectivity } } - void SAL_CALL ODriverDelegator::preCommit( const css::lang::EventObject& aEvent ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) + void SAL_CALL ODriverDelegator::preCommit( const css::lang::EventObject& aEvent ) { ::osl::MutexGuard aGuard(m_aMutex); @@ -668,15 +668,15 @@ namespace connectivity } } - void SAL_CALL ODriverDelegator::commited( const css::lang::EventObject& /*aEvent*/ ) throw (css::uno::RuntimeException, std::exception) + void SAL_CALL ODriverDelegator::commited( const css::lang::EventObject& /*aEvent*/ ) { } - void SAL_CALL ODriverDelegator::preRevert( const css::lang::EventObject& /*aEvent*/ ) throw (css::uno::Exception, css::uno::RuntimeException, std::exception) + void SAL_CALL ODriverDelegator::preRevert( const css::lang::EventObject& /*aEvent*/ ) { } - void SAL_CALL ODriverDelegator::reverted( const css::lang::EventObject& /*aEvent*/ ) throw (css::uno::RuntimeException, std::exception) + void SAL_CALL ODriverDelegator::reverted( const css::lang::EventObject& /*aEvent*/ ) { } diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx index 8a2aea665be8..6bcecb57509a 100644 --- a/connectivity/source/drivers/hsqldb/HTable.cxx +++ b/connectivity/source/drivers/hsqldb/HTable.cxx @@ -143,7 +143,7 @@ Sequence< sal_Int8 > OHSQLTable::getUnoTunnelImplementationId() // css::lang::XUnoTunnel -sal_Int64 OHSQLTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception) +sal_Int64 OHSQLTable::getSomething( const Sequence< sal_Int8 > & rId ) { return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) ? reinterpret_cast< sal_Int64 >( this ) @@ -151,7 +151,7 @@ sal_Int64 OHSQLTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (Ru } // XAlterTable -void SAL_CALL OHSQLTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException, std::exception) +void SAL_CALL OHSQLTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed( @@ -338,7 +338,7 @@ void OHSQLTable::executeStatement(const OUString& _rStatement ) } } -Sequence< Type > SAL_CALL OHSQLTable::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL OHSQLTable::getTypes( ) { if ( m_Type == "VIEW" ) { @@ -360,7 +360,7 @@ Sequence< Type > SAL_CALL OHSQLTable::getTypes( ) throw(RuntimeException, std:: } // XRename -void SAL_CALL OHSQLTable::rename( const OUString& newName ) throw(SQLException, ElementExistException, RuntimeException, std::exception) +void SAL_CALL OHSQLTable::rename( const OUString& newName ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed( @@ -396,7 +396,7 @@ void SAL_CALL OHSQLTable::rename( const OUString& newName ) throw(SQLException, } -Any SAL_CALL OHSQLTable::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OHSQLTable::queryInterface( const Type & rType ) { if( m_Type == "VIEW" && rType == cppu::UnoType::get()) return Any(); diff --git a/connectivity/source/drivers/hsqldb/HTables.cxx b/connectivity/source/drivers/hsqldb/HTables.cxx index 30ff90cea020..bdf01be13a1b 100644 --- a/connectivity/source/drivers/hsqldb/HTables.cxx +++ b/connectivity/source/drivers/hsqldb/HTables.cxx @@ -88,7 +88,7 @@ sdbcx::ObjectType OTables::createObject(const OUString& _rName) return xRet; } -void OTables::impl_refresh( ) throw(RuntimeException) +void OTables::impl_refresh( ) { static_cast(m_rParent).refreshTables(); } diff --git a/connectivity/source/drivers/hsqldb/HTerminateListener.cxx b/connectivity/source/drivers/hsqldb/HTerminateListener.cxx index 84c84fb5a273..6d1b5f1b254e 100644 --- a/connectivity/source/drivers/hsqldb/HTerminateListener.cxx +++ b/connectivity/source/drivers/hsqldb/HTerminateListener.cxx @@ -32,19 +32,16 @@ namespace connectivity // XEventListener void SAL_CALL OConnectionController::disposing( const EventObject& /*Source*/ ) -throw( RuntimeException, std::exception ) { } // XTerminateListener void SAL_CALL OConnectionController::queryTermination( const EventObject& /*aEvent*/ ) -throw( TerminationVetoException, RuntimeException, std::exception ) { m_pDriver->flushConnections(); } void SAL_CALL OConnectionController::notifyTermination( const EventObject& /*aEvent*/ ) -throw( RuntimeException, std::exception ) { m_pDriver->shutdownConnections(); } diff --git a/connectivity/source/drivers/hsqldb/HTerminateListener.hxx b/connectivity/source/drivers/hsqldb/HTerminateListener.hxx index 5b5a86da9713..62e8ec79d660 100644 --- a/connectivity/source/drivers/hsqldb/HTerminateListener.hxx +++ b/connectivity/source/drivers/hsqldb/HTerminateListener.hxx @@ -39,14 +39,11 @@ namespace connectivity explicit OConnectionController(ODriverDelegator* _pDriver) : m_pDriver(_pDriver){} // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; // XTerminateListener - virtual void SAL_CALL queryTermination( const css::lang::EventObject& aEvent ) - throw( css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception ) override; - virtual void SAL_CALL notifyTermination( const css::lang::EventObject& aEvent ) - throw( css::uno::RuntimeException, std::exception ) override; + virtual void SAL_CALL queryTermination( const css::lang::EventObject& aEvent ) override; + virtual void SAL_CALL notifyTermination( const css::lang::EventObject& aEvent ) override; }; } diff --git a/connectivity/source/drivers/hsqldb/HUser.cxx b/connectivity/source/drivers/hsqldb/HUser.cxx index e736830af6be..a73df49dec7a 100644 --- a/connectivity/source/drivers/hsqldb/HUser.cxx +++ b/connectivity/source/drivers/hsqldb/HUser.cxx @@ -77,7 +77,7 @@ cppu::IPropertyArrayHelper & OUserExtend::getInfoHelper() } typedef connectivity::sdbcx::OUser_BASE OUser_BASE_RBHELPER; -sal_Int32 SAL_CALL OHSQLUser::getPrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OHSQLUser::getPrivileges( const OUString& objName, sal_Int32 objType ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed); @@ -87,7 +87,7 @@ sal_Int32 SAL_CALL OHSQLUser::getPrivileges( const OUString& objName, sal_Int32 return nRights; } -void OHSQLUser::findPrivilegesAndGrantPrivileges(const OUString& objName, sal_Int32 objType,sal_Int32& nRights,sal_Int32& nRightsWithGrant) throw(SQLException, RuntimeException) +void OHSQLUser::findPrivilegesAndGrantPrivileges(const OUString& objName, sal_Int32 objType,sal_Int32& nRights,sal_Int32& nRightsWithGrant) { nRightsWithGrant = nRights = 0; // first we need to create the sql stmt to select the privs @@ -192,7 +192,7 @@ void OHSQLUser::findPrivilegesAndGrantPrivileges(const OUString& objName, sal_In } } -sal_Int32 SAL_CALL OHSQLUser::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OHSQLUser::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed); @@ -202,7 +202,7 @@ sal_Int32 SAL_CALL OHSQLUser::getGrantablePrivileges( const OUString& objName, s return nRightsWithGrant; } -void SAL_CALL OHSQLUser::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OHSQLUser::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) { if ( objType != PrivilegeObject::TABLE ) { @@ -229,7 +229,7 @@ void SAL_CALL OHSQLUser::grantPrivileges( const OUString& objName, sal_Int32 obj } } -void SAL_CALL OHSQLUser::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OHSQLUser::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) { if ( objType != PrivilegeObject::TABLE ) { @@ -256,7 +256,7 @@ void SAL_CALL OHSQLUser::revokePrivileges( const OUString& objName, sal_Int32 ob } // XUser -void SAL_CALL OHSQLUser::changePassword( const OUString& /*oldPassword*/, const OUString& newPassword ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OHSQLUser::changePassword( const OUString& /*oldPassword*/, const OUString& newPassword ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/hsqldb/HUsers.cxx b/connectivity/source/drivers/hsqldb/HUsers.cxx index 771645269f9c..812d8edcd237 100644 --- a/connectivity/source/drivers/hsqldb/HUsers.cxx +++ b/connectivity/source/drivers/hsqldb/HUsers.cxx @@ -54,7 +54,7 @@ sdbcx::ObjectType OUsers::createObject(const OUString& _rName) return new OHSQLUser(m_xConnection,_rName); } -void OUsers::impl_refresh() throw(RuntimeException) +void OUsers::impl_refresh() { m_pParent->refreshUsers(); } diff --git a/connectivity/source/drivers/hsqldb/HView.cxx b/connectivity/source/drivers/hsqldb/HView.cxx index f98dcd57367a..e2ee450581e9 100644 --- a/connectivity/source/drivers/hsqldb/HView.cxx +++ b/connectivity/source/drivers/hsqldb/HView.cxx @@ -69,7 +69,7 @@ namespace connectivity { namespace hsqldb IMPLEMENT_FORWARD_XTYPEPROVIDER2( HView, HView_Base, HView_IBASE ) - void SAL_CALL HView::alterCommand( const OUString& _rNewCommand ) throw (SQLException, RuntimeException, std::exception) + void SAL_CALL HView::alterCommand( const OUString& _rNewCommand ) { // not really atomic ... as long as we do not have something like // ALTER VIEW TO diff --git a/connectivity/source/drivers/hsqldb/HViews.cxx b/connectivity/source/drivers/hsqldb/HViews.cxx index dc0dd69de886..54de4ebe9940 100644 --- a/connectivity/source/drivers/hsqldb/HViews.cxx +++ b/connectivity/source/drivers/hsqldb/HViews.cxx @@ -73,7 +73,7 @@ sdbcx::ObjectType HViews::createObject(const OUString& _rName) } -void HViews::impl_refresh( ) throw(RuntimeException) +void HViews::impl_refresh( ) { static_cast(m_rParent).refreshTables(); } diff --git a/connectivity/source/drivers/jdbc/Array.cxx b/connectivity/source/drivers/jdbc/Array.cxx index 87928d901fe2..445848483dd6 100644 --- a/connectivity/source/drivers/jdbc/Array.cxx +++ b/connectivity/source/drivers/jdbc/Array.cxx @@ -40,19 +40,19 @@ jclass java_sql_Array::getMyClass() const return theClass; } -OUString SAL_CALL java_sql_Array::getBaseTypeName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +OUString SAL_CALL java_sql_Array::getBaseTypeName( ) { static jmethodID mID(nullptr); return callStringMethod("getBaseTypeName",mID); } -sal_Int32 SAL_CALL java_sql_Array::getBaseType( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_Array::getBaseType( ) { static jmethodID mID(nullptr); return callIntMethod_ThrowSQL("getBaseType", mID); } -css::uno::Sequence< css::uno::Any > SAL_CALL java_sql_Array::getArray( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +css::uno::Sequence< css::uno::Any > SAL_CALL java_sql_Array::getArray( const css::uno::Reference< css::container::XNameAccess >& typeMap ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); { @@ -70,7 +70,7 @@ css::uno::Sequence< css::uno::Any > SAL_CALL java_sql_Array::getArray( const css return css::uno::Sequence< css::uno::Any >(); } -css::uno::Sequence< css::uno::Any > SAL_CALL java_sql_Array::getArrayAtIndex( sal_Int32 index, sal_Int32 count, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +css::uno::Sequence< css::uno::Any > SAL_CALL java_sql_Array::getArrayAtIndex( sal_Int32 index, sal_Int32 count, const css::uno::Reference< css::container::XNameAccess >& typeMap ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); { @@ -88,7 +88,7 @@ css::uno::Sequence< css::uno::Any > SAL_CALL java_sql_Array::getArrayAtIndex( sa return css::uno::Sequence< css::uno::Any >(); } -css::uno::Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Array::getResultSet( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +css::uno::Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Array::getResultSet( const css::uno::Reference< css::container::XNameAccess >& typeMap ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); { @@ -108,7 +108,7 @@ css::uno::Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Array::getResultS return nullptr; } -css::uno::Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Array::getResultSetAtIndex( sal_Int32 index, sal_Int32 count, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +css::uno::Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Array::getResultSetAtIndex( sal_Int32 index, sal_Int32 count, const css::uno::Reference< css::container::XNameAccess >& typeMap ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); { diff --git a/connectivity/source/drivers/jdbc/Blob.cxx b/connectivity/source/drivers/jdbc/Blob.cxx index 9ec663127e77..7f0581104ada 100644 --- a/connectivity/source/drivers/jdbc/Blob.cxx +++ b/connectivity/source/drivers/jdbc/Blob.cxx @@ -48,7 +48,7 @@ jclass java_sql_Blob::getMyClass() const return theClass; } -sal_Int64 SAL_CALL java_sql_Blob::length( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL java_sql_Blob::length( ) { jlong out(0); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); @@ -65,7 +65,7 @@ sal_Int64 SAL_CALL java_sql_Blob::length( ) throw(css::sdbc::SQLException, css: } //t.pEnv return (sal_Int64)out; } -css::uno::Sequence< sal_Int8 > SAL_CALL java_sql_Blob::getBytes( sal_Int64 pos, sal_Int32 count ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +css::uno::Sequence< sal_Int8 > SAL_CALL java_sql_Blob::getBytes( sal_Int64 pos, sal_Int32 count ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); @@ -91,7 +91,7 @@ css::uno::Sequence< sal_Int8 > SAL_CALL java_sql_Blob::getBytes( sal_Int64 pos, return aSeq; } -css::uno::Reference< css::io::XInputStream > SAL_CALL java_sql_Blob::getBinaryStream( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +css::uno::Reference< css::io::XInputStream > SAL_CALL java_sql_Blob::getBinaryStream( ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); static jmethodID mID(nullptr); @@ -100,7 +100,7 @@ css::uno::Reference< css::io::XInputStream > SAL_CALL java_sql_Blob::getBinarySt return out==nullptr ? nullptr : new java_io_InputStream( t.pEnv, out ); } -sal_Int64 SAL_CALL java_sql_Blob::position( const css::uno::Sequence< sal_Int8 >& pattern, sal_Int64 start ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL java_sql_Blob::position( const css::uno::Sequence< sal_Int8 >& pattern, sal_Int64 start ) { jlong out(0); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); @@ -130,7 +130,7 @@ sal_Int64 SAL_CALL java_sql_Blob::position( const css::uno::Sequence< sal_Int8 > return (sal_Int64)out; } -sal_Int64 SAL_CALL java_sql_Blob::positionOfBlob( const css::uno::Reference< css::sdbc::XBlob >& /*pattern*/, sal_Int64 /*start*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL java_sql_Blob::positionOfBlob( const css::uno::Reference< css::sdbc::XBlob >& /*pattern*/, sal_Int64 /*start*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XBlob::positionOfBlob", *this ); // this was put here in CWS warnings01. The previous implementation was defective, as it did ignore diff --git a/connectivity/source/drivers/jdbc/CallableStatement.cxx b/connectivity/source/drivers/jdbc/CallableStatement.cxx index c74ae7815552..f9c3d426bdbf 100644 --- a/connectivity/source/drivers/jdbc/CallableStatement.cxx +++ b/connectivity/source/drivers/jdbc/CallableStatement.cxx @@ -54,13 +54,13 @@ java_sql_CallableStatement::~java_sql_CallableStatement() } -Any SAL_CALL java_sql_CallableStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL java_sql_CallableStatement::queryInterface( const Type & rType ) { Any aRet = java_sql_PreparedStatement::queryInterface(rType); return aRet.hasValue() ? aRet : ::cppu::queryInterface(rType,static_cast< css::sdbc::XRow*>(this),static_cast< css::sdbc::XOutParameters*>(this)); } -css::uno::Sequence< css::uno::Type > SAL_CALL java_sql_CallableStatement::getTypes( ) throw(css::uno::RuntimeException, std::exception) +css::uno::Sequence< css::uno::Type > SAL_CALL java_sql_CallableStatement::getTypes( ) { ::cppu::OTypeCollection aTypes( cppu::UnoType::get(), cppu::UnoType::get()); @@ -68,7 +68,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL java_sql_CallableStatement::getTyp return ::comphelper::concatSequences(aTypes.getTypes(),java_sql_PreparedStatement::getTypes()); } -sal_Bool SAL_CALL java_sql_CallableStatement::wasNull( ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_CallableStatement::wasNull( ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -76,14 +76,14 @@ sal_Bool SAL_CALL java_sql_CallableStatement::wasNull( ) throw(css::sdbc::SQLEx return callBooleanMethod( "wasNull", mID ); } -sal_Bool SAL_CALL java_sql_CallableStatement::getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_CallableStatement::getBoolean( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); static jmethodID mID(nullptr); return callBooleanMethodWithIntArg( "getBoolean", mID,columnIndex ); } -sal_Int8 SAL_CALL java_sql_CallableStatement::getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +sal_Int8 SAL_CALL java_sql_CallableStatement::getByte( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -91,7 +91,7 @@ sal_Int8 SAL_CALL java_sql_CallableStatement::getByte( sal_Int32 columnIndex ) t jbyte (JNIEnv::*pCallMethod)( jobject obj, jmethodID methodID, ... ) = &JNIEnv::CallByteMethod; return callMethodWithIntArg(pCallMethod,"getByte","(I)B",mID,columnIndex); } -Sequence< sal_Int8 > SAL_CALL java_sql_CallableStatement::getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +Sequence< sal_Int8 > SAL_CALL java_sql_CallableStatement::getBytes( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -110,7 +110,7 @@ Sequence< sal_Int8 > SAL_CALL java_sql_CallableStatement::getBytes( sal_Int32 co } return aSeq; } -css::util::Date SAL_CALL java_sql_CallableStatement::getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +css::util::Date SAL_CALL java_sql_CallableStatement::getDate( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -118,7 +118,7 @@ css::util::Date SAL_CALL java_sql_CallableStatement::getDate( sal_Int32 columnIn jobject out = callObjectMethodWithIntArg(t.pEnv,"getDate","(I)Ljava/sql/Date;", mID, columnIndex); return out ? static_cast (java_sql_Date( t.pEnv, out )) : css::util::Date(); } -double SAL_CALL java_sql_CallableStatement::getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +double SAL_CALL java_sql_CallableStatement::getDouble( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -127,7 +127,7 @@ double SAL_CALL java_sql_CallableStatement::getDouble( sal_Int32 columnIndex ) t return callMethodWithIntArg(pCallMethod,"getDouble","(I)D",mID,columnIndex); } -float SAL_CALL java_sql_CallableStatement::getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +float SAL_CALL java_sql_CallableStatement::getFloat( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -136,7 +136,7 @@ float SAL_CALL java_sql_CallableStatement::getFloat( sal_Int32 columnIndex ) thr return callMethodWithIntArg(pCallMethod,"getFloat","(I)F",mID,columnIndex); } -sal_Int32 SAL_CALL java_sql_CallableStatement::getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_CallableStatement::getInt( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -144,7 +144,7 @@ sal_Int32 SAL_CALL java_sql_CallableStatement::getInt( sal_Int32 columnIndex ) t return callIntMethodWithIntArg_ThrowSQL("getInt",mID,columnIndex); } -sal_Int64 SAL_CALL java_sql_CallableStatement::getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +sal_Int64 SAL_CALL java_sql_CallableStatement::getLong( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -153,7 +153,7 @@ sal_Int64 SAL_CALL java_sql_CallableStatement::getLong( sal_Int32 columnIndex ) return callMethodWithIntArg(pCallMethod,"getLong","(I)J",mID,columnIndex); } -Any SAL_CALL java_sql_CallableStatement::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +Any SAL_CALL java_sql_CallableStatement::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -163,7 +163,7 @@ Any SAL_CALL java_sql_CallableStatement::getObject( sal_Int32 columnIndex, const return Any(); } -sal_Int16 SAL_CALL java_sql_CallableStatement::getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +sal_Int16 SAL_CALL java_sql_CallableStatement::getShort( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -172,7 +172,7 @@ sal_Int16 SAL_CALL java_sql_CallableStatement::getShort( sal_Int32 columnIndex ) return callMethodWithIntArg(pCallMethod,"getShort","(I)S",mID,columnIndex); } -OUString SAL_CALL java_sql_CallableStatement::getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_CallableStatement::getString( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -182,7 +182,7 @@ OUString SAL_CALL java_sql_CallableStatement::getString( sal_Int32 columnIndex ) return callStringMethodWithIntArg("getString",mID,columnIndex); } - css::util::Time SAL_CALL java_sql_CallableStatement::getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) + css::util::Time SAL_CALL java_sql_CallableStatement::getTime( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -192,7 +192,7 @@ OUString SAL_CALL java_sql_CallableStatement::getString( sal_Int32 columnIndex ) return out ? static_cast (java_sql_Time( t.pEnv, out )) : css::util::Time(); } - css::util::DateTime SAL_CALL java_sql_CallableStatement::getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) + css::util::DateTime SAL_CALL java_sql_CallableStatement::getTimestamp( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -202,7 +202,7 @@ OUString SAL_CALL java_sql_CallableStatement::getString( sal_Int32 columnIndex ) return out ? static_cast (java_sql_Timestamp( t.pEnv, out )) : css::util::DateTime(); } -void SAL_CALL java_sql_CallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +void SAL_CALL java_sql_CallableStatement::registerOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -223,7 +223,7 @@ void SAL_CALL java_sql_CallableStatement::registerOutParameter( sal_Int32 parame ThrowLoggedSQLException( m_aLogger, t.pEnv, *this ); } } -void SAL_CALL java_sql_CallableStatement::registerNumericOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_CallableStatement::registerNumericOutParameter( sal_Int32 parameterIndex, sal_Int32 sqlType, sal_Int32 scale ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -252,18 +252,18 @@ jclass java_sql_CallableStatement::getMyClass() const return theClass; } -Reference< css::io::XInputStream > SAL_CALL java_sql_CallableStatement::getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +Reference< css::io::XInputStream > SAL_CALL java_sql_CallableStatement::getBinaryStream( sal_Int32 columnIndex ) { Reference< css::sdbc::XBlob > xBlob = getBlob(columnIndex); return xBlob.is() ? xBlob->getBinaryStream() : Reference< css::io::XInputStream >(); } -Reference< css::io::XInputStream > SAL_CALL java_sql_CallableStatement::getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +Reference< css::io::XInputStream > SAL_CALL java_sql_CallableStatement::getCharacterStream( sal_Int32 columnIndex ) { Reference< css::sdbc::XClob > xClob = getClob(columnIndex); return xClob.is() ? xClob->getCharacterStream() : Reference< css::io::XInputStream >(); } -Reference< css::sdbc::XArray > SAL_CALL java_sql_CallableStatement::getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +Reference< css::sdbc::XArray > SAL_CALL java_sql_CallableStatement::getArray( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -273,7 +273,7 @@ Reference< css::sdbc::XArray > SAL_CALL java_sql_CallableStatement::getArray( sa return out==nullptr ? nullptr : new java_sql_Array( t.pEnv, out ); } -Reference< css::sdbc::XClob > SAL_CALL java_sql_CallableStatement::getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +Reference< css::sdbc::XClob > SAL_CALL java_sql_CallableStatement::getClob( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -282,7 +282,7 @@ Reference< css::sdbc::XClob > SAL_CALL java_sql_CallableStatement::getClob( sal_ // WARNING: the caller becomes the owner of the returned pointer return out==nullptr ? nullptr : new java_sql_Clob( t.pEnv, out ); } -Reference< css::sdbc::XBlob > SAL_CALL java_sql_CallableStatement::getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +Reference< css::sdbc::XBlob > SAL_CALL java_sql_CallableStatement::getBlob( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -292,7 +292,7 @@ Reference< css::sdbc::XBlob > SAL_CALL java_sql_CallableStatement::getBlob( sal_ return out==nullptr ? nullptr : new java_sql_Blob( t.pEnv, out ); } -Reference< css::sdbc::XRef > SAL_CALL java_sql_CallableStatement::getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +Reference< css::sdbc::XRef > SAL_CALL java_sql_CallableStatement::getRef( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); diff --git a/connectivity/source/drivers/jdbc/Clob.cxx b/connectivity/source/drivers/jdbc/Clob.cxx index 44424c9084ae..e309a32ffb52 100644 --- a/connectivity/source/drivers/jdbc/Clob.cxx +++ b/connectivity/source/drivers/jdbc/Clob.cxx @@ -47,7 +47,7 @@ jclass java_sql_Clob::getMyClass() const return theClass; } -sal_Int64 SAL_CALL java_sql_Clob::length( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL java_sql_Clob::length( ) { jlong out(0); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); @@ -65,7 +65,7 @@ sal_Int64 SAL_CALL java_sql_Clob::length( ) throw(css::sdbc::SQLException, css: return (sal_Int64)out; } -OUString SAL_CALL java_sql_Clob::getSubString( sal_Int64 pos, sal_Int32 subStringLength ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +OUString SAL_CALL java_sql_Clob::getSubString( sal_Int64 pos, sal_Int32 subStringLength ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); OUString aStr; @@ -84,7 +84,7 @@ OUString SAL_CALL java_sql_Clob::getSubString( sal_Int64 pos, sal_Int32 subStrin return aStr; } -css::uno::Reference< css::io::XInputStream > SAL_CALL java_sql_Clob::getCharacterStream( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +css::uno::Reference< css::io::XInputStream > SAL_CALL java_sql_Clob::getCharacterStream( ) { SDBThreadAttach t; static jmethodID mID(nullptr); @@ -94,7 +94,7 @@ css::uno::Reference< css::io::XInputStream > SAL_CALL java_sql_Clob::getCharacte return out==nullptr ? nullptr : new java_io_Reader( t.pEnv, out ); } -sal_Int64 SAL_CALL java_sql_Clob::position( const OUString& searchstr, sal_Int32 start ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL java_sql_Clob::position( const OUString& searchstr, sal_Int32 start ) { jlong out(0); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); @@ -116,7 +116,7 @@ sal_Int64 SAL_CALL java_sql_Clob::position( const OUString& searchstr, sal_Int32 return (sal_Int64)out; } -sal_Int64 SAL_CALL java_sql_Clob::positionOfClob( const css::uno::Reference< css::sdbc::XClob >& /*pattern*/, sal_Int64 /*start*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Int64 SAL_CALL java_sql_Clob::positionOfClob( const css::uno::Reference< css::sdbc::XClob >& /*pattern*/, sal_Int64 /*start*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XClob::positionOfClob", *this ); // this was put here in CWS warnings01. The previous implementation was defective, as it did ignore diff --git a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx index acc09749faa9..f0dcd168cbb7 100644 --- a/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx +++ b/connectivity/source/drivers/jdbc/DatabaseMetaData.cxx @@ -69,7 +69,7 @@ Reference< XResultSet > java_sql_DatabaseMetaData::impl_getTypeInfo_throw( ) return impl_callResultSetMethod( "getTypeInfo", mID ); } -Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getCatalogs( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getCatalogs( ) { static jmethodID mID(nullptr); return impl_callResultSetMethod( "getCatalogs", mID ); @@ -81,21 +81,21 @@ OUString java_sql_DatabaseMetaData::impl_getCatalogSeparator_throw( ) return impl_callStringMethod( "getCatalogSeparator", mID ); } -Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getSchemas( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getSchemas( ) { static jmethodID mID(nullptr); return impl_callResultSetMethod( "getSchemas", mID ); } Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getColumnPrivileges( - const Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception) + const Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) { static jmethodID mID(nullptr); return impl_callResultSetMethodWithStrings( "getColumnPrivileges", mID, catalog, schema, table, &columnNamePattern ); } Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getColumns( - const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception) + const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) { static jmethodID mID(nullptr); return impl_callResultSetMethodWithStrings( "getColumns", mID, catalog, schemaPattern, tableNamePattern, &columnNamePattern ); @@ -103,7 +103,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getColumns( Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTables( - const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const Sequence< OUString >& _types ) throw(SQLException, RuntimeException, std::exception) + const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const Sequence< OUString >& _types ) { static const char * const cMethodName = "getTables"; @@ -217,87 +217,87 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTables( } Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getProcedureColumns( - const Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception) + const Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) { static jmethodID mID(nullptr); return impl_callResultSetMethodWithStrings( "getProcedureColumns", mID, catalog, schemaPattern, procedureNamePattern, &columnNamePattern ); } Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getProcedures( const Any& - catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) throw(SQLException, RuntimeException, std::exception) + catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) { static jmethodID mID(nullptr); return impl_callResultSetMethodWithStrings( "getProcedures", mID, catalog, schemaPattern, procedureNamePattern ); } Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getVersionColumns( - const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException, std::exception) + const Any& catalog, const OUString& schema, const OUString& table ) { static jmethodID mID(nullptr); return impl_callResultSetMethodWithStrings( "getVersionColumns", mID, catalog, schema, table ); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxBinaryLiteralLength( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowSQL("getMaxBinaryLiteralLength", mID); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxRowSize( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxRowSize( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowSQL("getMaxRowSize", mID); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxCatalogNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxCatalogNameLength( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowSQL("getMaxCatalogNameLength", mID); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxCharLiteralLength( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowSQL("getMaxCharLiteralLength", mID); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnNameLength( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowSQL("getMaxColumnNameLength", mID); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInIndex( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowSQL("getMaxColumnsInIndex", mID); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxCursorNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxCursorNameLength( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowSQL("getMaxCursorNameLength", mID); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxConnections( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxConnections( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowSQL("getMaxConnections", mID); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInTable( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowSQL("getMaxColumnsInTable", mID); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxStatementLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxStatementLength( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowSQL("getMaxStatementLength", mID); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxTableNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxTableNameLength( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowSQL("getMaxTableNameLength", mID); @@ -310,21 +310,21 @@ sal_Int32 java_sql_DatabaseMetaData::impl_getMaxTablesInSelect_throw( ) } Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getExportedKeys( - const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException, std::exception) + const Any& catalog, const OUString& schema, const OUString& table ) { static jmethodID mID(nullptr); return impl_callResultSetMethodWithStrings( "getExportedKeys", mID, catalog, schema, table ); } Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getImportedKeys( - const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException, std::exception) + const Any& catalog, const OUString& schema, const OUString& table ) { static jmethodID mID(nullptr); return impl_callResultSetMethodWithStrings( "getImportedKeys", mID, catalog, schema, table ); } Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getPrimaryKeys( - const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException, std::exception) + const Any& catalog, const OUString& schema, const OUString& table ) { static jmethodID mID(nullptr); return impl_callResultSetMethodWithStrings( "getPrimaryKeys", mID, catalog, schema, table ); @@ -332,7 +332,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getPrimaryKeys( Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getIndexInfo( const Any& catalog, const OUString& schema, const OUString& table, - sal_Bool unique, sal_Bool approximate ) throw(SQLException, RuntimeException, std::exception) + sal_Bool unique, sal_Bool approximate ) { static const char * const cMethodName = "getIndexInfo"; @@ -373,7 +373,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getIndexInfo( Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getBestRowIdentifier( const Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, - sal_Bool nullable ) throw(SQLException, RuntimeException, std::exception) + sal_Bool nullable ) { static const char * const cMethodName = "getBestRowIdentifier"; @@ -412,7 +412,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getBestRowIdentifier } Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTablePrivileges( - const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(SQLException, RuntimeException, std::exception) + const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) { if ( m_pConnection->isIgnoreDriverPrivilegesEnabled() ) return new OResultSetPrivileges(this,catalog,schemaPattern,tableNamePattern); @@ -490,7 +490,7 @@ Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTablePrivileges( Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getCrossReference( const Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const Any& foreignCatalog, - const OUString& foreignSchema, const OUString& foreignTable ) throw(SQLException, RuntimeException, std::exception) + const OUString& foreignSchema, const OUString& foreignTable ) { static const char * const cMethodName = "getCrossReference"; m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_METHOD, cMethodName ); @@ -669,19 +669,19 @@ Reference< XResultSet > java_sql_DatabaseMetaData::impl_callResultSetMethodWithS } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "doesMaxRowSizeIncludeBlobs", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "storesLowerCaseQuotedIdentifiers", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesLowerCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesLowerCaseIdentifiers( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "storesLowerCaseIdentifiers", mID ); @@ -693,19 +693,19 @@ bool java_sql_DatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) return impl_callBooleanMethod( "storesMixedCaseQuotedIdentifiers", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesMixedCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesMixedCaseIdentifiers( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "storesMixedCaseIdentifiers", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "storesUpperCaseQuotedIdentifiers", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesUpperCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::storesUpperCaseIdentifiers( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "storesUpperCaseIdentifiers", mID ); @@ -723,19 +723,19 @@ bool java_sql_DatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw( ) return impl_callBooleanMethod( "supportsAlterTableWithDropColumn", mID ); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxIndexLength( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowSQL("getMaxIndexLength", mID); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsNonNullableColumns( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsNonNullableColumns( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsNonNullableColumns", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_DatabaseMetaData::getCatalogTerm( ) { static jmethodID mID(nullptr); return impl_callStringMethod( "getCatalogTerm", mID ); @@ -747,13 +747,13 @@ OUString java_sql_DatabaseMetaData::impl_getIdentifierQuoteString_throw( ) return impl_callStringMethod( "getIdentifierQuoteString", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_DatabaseMetaData::getExtraNameCharacters( ) { static jmethodID mID(nullptr); return impl_callStringMethod( "getExtraNameCharacters", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsDifferentTableCorrelationNames( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsDifferentTableCorrelationNames( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsDifferentTableCorrelationNames", mID ); @@ -765,67 +765,67 @@ bool java_sql_DatabaseMetaData::impl_isCatalogAtStart_throw( ) return impl_callBooleanMethod( "isCatalogAtStart", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::dataDefinitionIgnoredInTransactions( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "dataDefinitionIgnoredInTransactions", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::dataDefinitionCausesTransactionCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::dataDefinitionCausesTransactionCommit( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "dataDefinitionCausesTransactionCommit", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsDataManipulationTransactionsOnly( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsDataManipulationTransactionsOnly( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsDataManipulationTransactionsOnly", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsDataDefinitionAndDataManipulationTransactions", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsPositionedDelete( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsPositionedDelete( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsPositionedDelete", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsPositionedUpdate( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsPositionedUpdate( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsPositionedUpdate", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOpenStatementsAcrossRollback( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOpenStatementsAcrossRollback( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsOpenStatementsAcrossRollback", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOpenStatementsAcrossCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOpenStatementsAcrossCommit( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsOpenStatementsAcrossCommit", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOpenCursorsAcrossCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOpenCursorsAcrossCommit( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsOpenCursorsAcrossCommit", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOpenCursorsAcrossRollback( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOpenCursorsAcrossRollback( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsOpenCursorsAcrossRollback", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level ) { static jmethodID mID(nullptr); return impl_callBooleanMethodWithIntArg( "supportsTransactionIsolationLevel", mID, level ); @@ -837,25 +837,25 @@ bool java_sql_DatabaseMetaData::impl_supportsSchemasInDataManipulation_throw( ) return impl_callBooleanMethod( "supportsSchemasInDataManipulation", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsANSI92FullSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsANSI92FullSQL( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsANSI92FullSQL", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsANSI92EntryLevelSQL( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsANSI92EntryLevelSQL", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsIntegrityEnhancementFacility( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsIntegrityEnhancementFacility", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSchemasInIndexDefinitions( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsSchemasInIndexDefinitions", mID ); @@ -873,7 +873,7 @@ bool java_sql_DatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw( return impl_callBooleanMethod( "supportsCatalogsInTableDefinitions", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCatalogsInIndexDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCatalogsInIndexDefinitions( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsCatalogsInIndexDefinitions", mID ); @@ -885,13 +885,13 @@ bool java_sql_DatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw( return impl_callBooleanMethod( "supportsCatalogsInDataManipulation", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOuterJoins( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOuterJoins( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsOuterJoins", mID ); } -Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getTableTypes( ) { static jmethodID mID(nullptr); return impl_callResultSetMethod( "getTableTypes", mID ); @@ -903,92 +903,92 @@ sal_Int32 java_sql_DatabaseMetaData::impl_getMaxStatements_throw( ) return impl_callIntMethod_ThrowSQL("getMaxStatements", mID); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxProcedureNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxProcedureNameLength( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowSQL("getMaxProcedureNameLength", mID); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxSchemaNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxSchemaNameLength( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowSQL("getMaxSchemaNameLength", mID); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsTransactions( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsTransactions", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::allProceduresAreCallable( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::allProceduresAreCallable( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "allProceduresAreCallable", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsStoredProcedures( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsStoredProcedures( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsStoredProcedures", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSelectForUpdate( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSelectForUpdate( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsSelectForUpdate", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::allTablesAreSelectable( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::allTablesAreSelectable( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "allTablesAreSelectable", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::isReadOnly( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "isReadOnly", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::usesLocalFiles( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::usesLocalFiles( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "usesLocalFiles", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::usesLocalFilePerTable( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::usesLocalFilePerTable( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "usesLocalFilePerTable", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsTypeConversion( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsTypeConversion( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsTypeConversion", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullPlusNonNullIsNull( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullPlusNonNullIsNull( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "nullPlusNonNullIsNull", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsColumnAliasing( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsColumnAliasing( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsColumnAliasing", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsTableCorrelationNames( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsTableCorrelationNames( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsTableCorrelationNames", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsConvert( sal_Int32 fromType, sal_Int32 toType ) { static const char* const pMethodName = "supportsConvert"; m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_METHOD_ARG2, pMethodName, fromType, toType ); @@ -1007,67 +1007,67 @@ sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsConvert( sal_Int32 fromType return out; } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsExpressionsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsExpressionsInOrderBy( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsExpressionsInOrderBy", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsGroupBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsGroupBy( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsGroupBy", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsGroupByBeyondSelect( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsGroupByBeyondSelect( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsGroupByBeyondSelect", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsGroupByUnrelated( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsGroupByUnrelated( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsGroupByUnrelated", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMultipleTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMultipleTransactions( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsMultipleTransactions", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMultipleResultSets( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMultipleResultSets( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsMultipleResultSets", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsLikeEscapeClause( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsLikeEscapeClause", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsOrderByUnrelated( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsOrderByUnrelated", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsUnion( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsUnion( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsUnion", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsUnionAll( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsUnionAll( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsUnionAll", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMixedCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMixedCaseIdentifiers( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsMixedCaseIdentifiers", mID ); @@ -1079,91 +1079,91 @@ bool java_sql_DatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw( return impl_callBooleanMethod( "supportsMixedCaseQuotedIdentifiers", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullsAreSortedAtEnd( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "nullsAreSortedAtEnd", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullsAreSortedAtStart( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullsAreSortedAtStart( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "nullsAreSortedAtStart", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullsAreSortedHigh( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullsAreSortedHigh( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "nullsAreSortedHigh", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullsAreSortedLow( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::nullsAreSortedLow( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "nullsAreSortedLow", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSchemasInProcedureCalls( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSchemasInProcedureCalls( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsSchemasInProcedureCalls", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsSchemasInPrivilegeDefinitions", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCatalogsInProcedureCalls( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsCatalogsInProcedureCalls", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsCatalogsInPrivilegeDefinitions", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCorrelatedSubqueries( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCorrelatedSubqueries( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsCorrelatedSubqueries", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSubqueriesInComparisons( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSubqueriesInComparisons( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsSubqueriesInComparisons", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSubqueriesInExists( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSubqueriesInExists( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsSubqueriesInExists", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSubqueriesInIns( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSubqueriesInIns( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsSubqueriesInIns", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsSubqueriesInQuantifieds( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsSubqueriesInQuantifieds", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsANSI92IntermediateSQL( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsANSI92IntermediateSQL", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getURL( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_DatabaseMetaData::getURL( ) { OUString sURL = m_pConnection->getURL(); if ( sURL.isEmpty() ) @@ -1174,163 +1174,163 @@ OUString SAL_CALL java_sql_DatabaseMetaData::getURL( ) throw(SQLException, Runt return sURL; } -OUString SAL_CALL java_sql_DatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_DatabaseMetaData::getUserName( ) { static jmethodID mID(nullptr); return impl_callStringMethod( "getUserName", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_DatabaseMetaData::getDriverName( ) { static jmethodID mID(nullptr); return impl_callStringMethod( "getDriverName", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getDriverVersion( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_DatabaseMetaData::getDriverVersion( ) { static jmethodID mID(nullptr); return impl_callStringMethod( "getDriverVersion", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_DatabaseMetaData::getDatabaseProductVersion( ) { static jmethodID mID(nullptr); return impl_callStringMethod( "getDatabaseProductVersion", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_DatabaseMetaData::getDatabaseProductName( ) { static jmethodID mID(nullptr); return impl_callStringMethod( "getDatabaseProductName", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_DatabaseMetaData::getProcedureTerm( ) { static jmethodID mID(nullptr); return impl_callStringMethod( "getProcedureTerm", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_DatabaseMetaData::getSchemaTerm( ) { static jmethodID mID(nullptr); return impl_callStringMethod( "getSchemaTerm", mID ); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getDriverMajorVersion( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowRuntime("getDriverMajorVersion", mID); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getDefaultTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getDefaultTransactionIsolation( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowSQL("getDefaultTransactionIsolation", mID); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getDriverMinorVersion( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowRuntime("getDriverMinorVersion", mID); } -OUString SAL_CALL java_sql_DatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_DatabaseMetaData::getSQLKeywords( ) { static jmethodID mID(nullptr); return impl_callStringMethod( "getSQLKeywords", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_DatabaseMetaData::getSearchStringEscape( ) { static jmethodID mID(nullptr); return impl_callStringMethod( "getSearchStringEscape", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_DatabaseMetaData::getStringFunctions( ) { static jmethodID mID(nullptr); return impl_callStringMethod( "getStringFunctions", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_DatabaseMetaData::getTimeDateFunctions( ) { static jmethodID mID(nullptr); return impl_callStringMethod( "getTimeDateFunctions", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_DatabaseMetaData::getSystemFunctions( ) { static jmethodID mID(nullptr); return impl_callStringMethod( "getSystemFunctions", mID ); } -OUString SAL_CALL java_sql_DatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_DatabaseMetaData::getNumericFunctions( ) { static jmethodID mID(nullptr); return impl_callStringMethod( "getNumericFunctions", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsExtendedSQLGrammar( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsExtendedSQLGrammar", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCoreSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsCoreSQLGrammar( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsCoreSQLGrammar", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMinimumSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsMinimumSQLGrammar( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsMinimumSQLGrammar", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsFullOuterJoins( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsFullOuterJoins( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsFullOuterJoins", mID ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsLimitedOuterJoins( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsLimitedOuterJoins", mID ); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInGroupBy( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowSQL("getMaxColumnsInGroupBy", mID); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInOrderBy( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowSQL("getMaxColumnsInOrderBy", mID); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxColumnsInSelect( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowSQL("getMaxColumnsInSelect", mID); } -sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxUserNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_DatabaseMetaData::getMaxUserNameLength( ) { static jmethodID mID(nullptr); return impl_callIntMethod_ThrowSQL("getMaxUserNameLength", mID); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsResultSetType( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsResultSetType( sal_Int32 setType ) { static jmethodID mID(nullptr); return impl_callBooleanMethodWithIntArg( "supportsResultSetType", mID, setType ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) { static const char* const pMethodName = "supportsResultSetConcurrency"; m_aLogger.log( LogLevel::FINEST, STR_LOG_META_DATA_METHOD_ARG2, pMethodName, setType, concurrency ); @@ -1349,61 +1349,61 @@ sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsResultSetConcurrency( sal_I return out; } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType ) { static jmethodID mID(nullptr); return impl_callBooleanMethodWithIntArg( "ownUpdatesAreVisible", mID, setType ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType ) { static jmethodID mID(nullptr); return impl_callBooleanMethodWithIntArg( "ownDeletesAreVisible", mID, setType ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType ) { static jmethodID mID(nullptr); return impl_callBooleanMethodWithIntArg( "ownInsertsAreVisible", mID, setType ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::othersUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::othersUpdatesAreVisible( sal_Int32 setType ) { static jmethodID mID(nullptr); return impl_callBooleanMethodWithIntArg( "othersUpdatesAreVisible", mID, setType ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::othersDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::othersDeletesAreVisible( sal_Int32 setType ) { static jmethodID mID(nullptr); return impl_callBooleanMethodWithIntArg( "othersDeletesAreVisible", mID, setType ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::othersInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::othersInsertsAreVisible( sal_Int32 setType ) { static jmethodID mID(nullptr); return impl_callBooleanMethodWithIntArg( "othersInsertsAreVisible", mID, setType ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::updatesAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::updatesAreDetected( sal_Int32 setType ) { static jmethodID mID(nullptr); return impl_callBooleanMethodWithIntArg( "updatesAreDetected", mID, setType ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::deletesAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::deletesAreDetected( sal_Int32 setType ) { static jmethodID mID(nullptr); return impl_callBooleanMethodWithIntArg( "deletesAreDetected", mID, setType ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::insertsAreDetected( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::insertsAreDetected( sal_Int32 setType ) { static jmethodID mID(nullptr); return impl_callBooleanMethodWithIntArg( "insertsAreDetected", mID, setType ); } -sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsBatchUpdates( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsBatchUpdates( ) { static jmethodID mID(nullptr); return impl_callBooleanMethod( "supportsBatchUpdates", mID ); @@ -1411,7 +1411,7 @@ sal_Bool SAL_CALL java_sql_DatabaseMetaData::supportsBatchUpdates( ) throw(SQLE Reference< XResultSet > SAL_CALL java_sql_DatabaseMetaData::getUDTs( const Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, - const Sequence< sal_Int32 >& types ) throw(SQLException, RuntimeException, std::exception) + const Sequence< sal_Int32 >& types ) { jobject out(nullptr); SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); diff --git a/connectivity/source/drivers/jdbc/InputStream.cxx b/connectivity/source/drivers/jdbc/InputStream.cxx index c63a1e491168..c3f3c01f8f7e 100644 --- a/connectivity/source/drivers/jdbc/InputStream.cxx +++ b/connectivity/source/drivers/jdbc/InputStream.cxx @@ -54,30 +54,30 @@ jclass java_io_InputStream::getMyClass() const } -sal_Int32 SAL_CALL java_io_InputStream::readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL java_io_InputStream::readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) { return readBytes(aData,nMaxBytesToRead); } -void SAL_CALL java_io_InputStream::skipBytes( sal_Int32 nBytesToSkip ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_io_InputStream::skipBytes( sal_Int32 nBytesToSkip ) { static jmethodID mID(nullptr); callIntMethodWithIntArg_ThrowRuntime("skip",mID,nBytesToSkip); } -sal_Int32 SAL_CALL java_io_InputStream::available( ) throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL java_io_InputStream::available( ) { static jmethodID mID(nullptr); return callIntMethod_ThrowRuntime("available", mID); } -void SAL_CALL java_io_InputStream::closeInput( ) throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_io_InputStream::closeInput( ) { static jmethodID mID(nullptr); callVoidMethod_ThrowRuntime("close",mID); } -sal_Int32 SAL_CALL java_io_InputStream::readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL java_io_InputStream::readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) { if (nBytesToRead < 0) throw css::io::BufferSizeExceededException( THROW_WHERE, *this ); diff --git a/connectivity/source/drivers/jdbc/JConnection.cxx b/connectivity/source/drivers/jdbc/JConnection.cxx index b311573fa8d3..a93cd4a12202 100644 --- a/connectivity/source/drivers/jdbc/JConnection.cxx +++ b/connectivity/source/drivers/jdbc/JConnection.cxx @@ -322,7 +322,7 @@ jclass java_sql_Connection::getMyClass() const } -OUString SAL_CALL java_sql_Connection::getCatalog( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_Connection::getCatalog( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed); @@ -331,7 +331,7 @@ OUString SAL_CALL java_sql_Connection::getCatalog( ) throw(SQLException, Runtim return callStringMethod("getCatalog",mID); } -Reference< XDatabaseMetaData > SAL_CALL java_sql_Connection::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XDatabaseMetaData > SAL_CALL java_sql_Connection::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed); @@ -353,18 +353,18 @@ Reference< XDatabaseMetaData > SAL_CALL java_sql_Connection::getMetaData( ) thr return xMetaData; } -void SAL_CALL java_sql_Connection::close( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL java_sql_Connection::close( ) { dispose(); } -void SAL_CALL java_sql_Connection::commit( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL java_sql_Connection::commit( ) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("commit", mID); } -sal_Bool SAL_CALL java_sql_Connection::isClosed( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_Connection::isClosed( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -372,7 +372,7 @@ sal_Bool SAL_CALL java_sql_Connection::isClosed( ) throw(SQLException, RuntimeE return callBooleanMethod( "isClosed", mID ) && java_sql_Connection_BASE::rBHelper.bDisposed; } -sal_Bool SAL_CALL java_sql_Connection::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_Connection::isReadOnly( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed); @@ -380,37 +380,37 @@ sal_Bool SAL_CALL java_sql_Connection::isReadOnly( ) throw(SQLException, Runtim return callBooleanMethod( "isReadOnly", mID ); } -void SAL_CALL java_sql_Connection::setCatalog( const OUString& catalog ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL java_sql_Connection::setCatalog( const OUString& catalog ) { static jmethodID mID(nullptr); callVoidMethodWithStringArg("setCatalog",mID,catalog); } -void SAL_CALL java_sql_Connection::rollback( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL java_sql_Connection::rollback( ) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("rollback", mID); } -sal_Bool SAL_CALL java_sql_Connection::getAutoCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_Connection::getAutoCommit( ) { static jmethodID mID(nullptr); return callBooleanMethod( "getAutoCommit", mID ); } -void SAL_CALL java_sql_Connection::setReadOnly( sal_Bool readOnly ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL java_sql_Connection::setReadOnly( sal_Bool readOnly ) { static jmethodID mID(nullptr); callVoidMethodWithBoolArg_ThrowSQL("setReadOnly", mID, readOnly); } -void SAL_CALL java_sql_Connection::setAutoCommit( sal_Bool autoCommit ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL java_sql_Connection::setAutoCommit( sal_Bool autoCommit ) { static jmethodID mID(nullptr); callVoidMethodWithBoolArg_ThrowSQL("setAutoCommit", mID, autoCommit); } -Reference< css::container::XNameAccess > SAL_CALL java_sql_Connection::getTypeMap( ) throw(SQLException, RuntimeException, std::exception) +Reference< css::container::XNameAccess > SAL_CALL java_sql_Connection::getTypeMap( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed); @@ -422,7 +422,7 @@ Reference< css::container::XNameAccess > SAL_CALL java_sql_Connection::getTypeMa return nullptr; } -void SAL_CALL java_sql_Connection::setTypeMap( const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL java_sql_Connection::setTypeMap( const Reference< css::container::XNameAccess >& /*typeMap*/ ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed); @@ -431,7 +431,7 @@ void SAL_CALL java_sql_Connection::setTypeMap( const Reference< css::container:: } -sal_Int32 SAL_CALL java_sql_Connection::getTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_Connection::getTransactionIsolation( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed); @@ -440,7 +440,7 @@ sal_Int32 SAL_CALL java_sql_Connection::getTransactionIsolation( ) throw(SQLExc return callIntMethod_ThrowSQL("getTransactionIsolation", mID); } -void SAL_CALL java_sql_Connection::setTransactionIsolation( sal_Int32 level ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL java_sql_Connection::setTransactionIsolation( sal_Int32 level ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed); @@ -449,7 +449,7 @@ void SAL_CALL java_sql_Connection::setTransactionIsolation( sal_Int32 level ) th callVoidMethodWithIntArg_ThrowSQL("setTransactionIsolation", mID, level); } -Reference< XStatement > SAL_CALL java_sql_Connection::createStatement( ) throw(SQLException, RuntimeException, std::exception) +Reference< XStatement > SAL_CALL java_sql_Connection::createStatement( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed); @@ -490,7 +490,7 @@ OUString java_sql_Connection::transFormPreparedStatement(const OUString& _sSQL) return sSqlStatement; } -Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareStatement( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed); @@ -508,7 +508,7 @@ Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareStatement( return xReturn; } -Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareCall( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareCall( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed); @@ -526,7 +526,7 @@ Reference< XPreparedStatement > SAL_CALL java_sql_Connection::prepareCall( const return xStmt; } -OUString SAL_CALL java_sql_Connection::nativeSQL( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_Connection::nativeSQL( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed); @@ -554,13 +554,13 @@ OUString SAL_CALL java_sql_Connection::nativeSQL( const OUString& sql ) throw(SQ return aStr; } -void SAL_CALL java_sql_Connection::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL java_sql_Connection::clearWarnings( ) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("clearWarnings", mID); } -Any SAL_CALL java_sql_Connection::getWarnings( ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL java_sql_Connection::getWarnings( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Connection_BASE::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/jdbc/JDriver.cxx b/connectivity/source/drivers/jdbc/JDriver.cxx index 5d69146d4a43..bb1d45337318 100644 --- a/connectivity/source/drivers/jdbc/JDriver.cxx +++ b/connectivity/source/drivers/jdbc/JDriver.cxx @@ -52,42 +52,42 @@ java_sql_Driver::~java_sql_Driver() // static ServiceInfo -OUString java_sql_Driver::getImplementationName_Static( ) throw(RuntimeException) +OUString java_sql_Driver::getImplementationName_Static( ) { return OUString("com.sun.star.comp.sdbc.JDBCDriver"); // this name is referenced in the configuration and in the jdbc.xml // Please take care when changing it. } -Sequence< OUString > java_sql_Driver::getSupportedServiceNames_Static( ) throw (RuntimeException) +Sequence< OUString > java_sql_Driver::getSupportedServiceNames_Static( ) { Sequence aSNS { "com.sun.star.sdbc.Driver" }; return aSNS; } -css::uno::Reference< css::uno::XInterface > SAL_CALL connectivity::java_sql_Driver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception ) +css::uno::Reference< css::uno::XInterface > SAL_CALL connectivity::java_sql_Driver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) { return *(new java_sql_Driver( comphelper::getComponentContext(_rxFactory))); } -OUString SAL_CALL java_sql_Driver::getImplementationName( ) throw(RuntimeException, std::exception) +OUString SAL_CALL java_sql_Driver::getImplementationName( ) { return getImplementationName_Static(); } -sal_Bool SAL_CALL java_sql_Driver::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_Driver::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } -Sequence< OUString > SAL_CALL java_sql_Driver::getSupportedServiceNames( ) throw(RuntimeException, std::exception) +Sequence< OUString > SAL_CALL java_sql_Driver::getSupportedServiceNames( ) { return getSupportedServiceNames_Static(); } Reference< XConnection > SAL_CALL java_sql_Driver::connect( const OUString& url, const - Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException, std::exception) + Sequence< PropertyValue >& info ) { m_aLogger.log( LogLevel::INFO, STR_LOG_DRIVER_CONNECTING_URL, url ); @@ -104,7 +104,7 @@ Reference< XConnection > SAL_CALL java_sql_Driver::connect( const OUString& url, return xOut; } -sal_Bool SAL_CALL java_sql_Driver::acceptsURL( const OUString& url ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_Driver::acceptsURL( const OUString& url ) { // don't ask the real driver for the url // I feel responsible for all jdbc url's @@ -127,7 +127,7 @@ sal_Bool SAL_CALL java_sql_Driver::acceptsURL( const OUString& url ) throw(SQLEx } Sequence< DriverPropertyInfo > SAL_CALL java_sql_Driver::getPropertyInfo( const OUString& url, - const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException, std::exception) + const Sequence< PropertyValue >& /*info*/ ) { if ( acceptsURL(url) ) { @@ -236,12 +236,12 @@ Sequence< DriverPropertyInfo > SAL_CALL java_sql_Driver::getPropertyInfo( const return Sequence< DriverPropertyInfo >(); } -sal_Int32 SAL_CALL java_sql_Driver::getMajorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_Driver::getMajorVersion( ) { return 1; } -sal_Int32 SAL_CALL java_sql_Driver::getMinorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_Driver::getMinorVersion( ) { return 0; } diff --git a/connectivity/source/drivers/jdbc/JStatement.cxx b/connectivity/source/drivers/jdbc/JStatement.cxx index 9154c5c07efc..87259c28dbbe 100644 --- a/connectivity/source/drivers/jdbc/JStatement.cxx +++ b/connectivity/source/drivers/jdbc/JStatement.cxx @@ -115,7 +115,7 @@ void SAL_CALL OStatement_BASE2::release() throw() } -Any SAL_CALL java_sql_Statement_Base::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL java_sql_Statement_Base::queryInterface( const Type & rType ) { if ( m_pConnection.is() && !m_pConnection->isAutoRetrievingEnabled() && rType == cppu::UnoType::get()) return Any(); @@ -123,7 +123,7 @@ Any SAL_CALL java_sql_Statement_Base::queryInterface( const Type & rType ) throw return aRet.hasValue() ? aRet : OPropertySetHelper::queryInterface(rType); } -Sequence< Type > SAL_CALL java_sql_Statement_Base::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL java_sql_Statement_Base::getTypes( ) { ::cppu::OTypeCollection aTypes( cppu::UnoType::get(), cppu::UnoType::get(), @@ -140,7 +140,7 @@ Sequence< Type > SAL_CALL java_sql_Statement_Base::getTypes( ) throw(RuntimeExc return ::comphelper::concatSequences(aTypes.getTypes(),aOldTypes); } -Reference< XResultSet > SAL_CALL java_sql_Statement_Base::getGeneratedValues( ) throw (SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL java_sql_Statement_Base::getGeneratedValues( ) { m_aLogger.log( LogLevel::FINE, STR_LOG_GENERATED_VALUES ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -182,7 +182,7 @@ Reference< XResultSet > SAL_CALL java_sql_Statement_Base::getGeneratedValues( ) } -void SAL_CALL java_sql_Statement_Base::cancel( ) throw(RuntimeException, std::exception) +void SAL_CALL java_sql_Statement_Base::cancel( ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -191,7 +191,7 @@ void SAL_CALL java_sql_Statement_Base::cancel( ) throw(RuntimeException, std::e } -void SAL_CALL java_sql_Statement_Base::close( ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +void SAL_CALL java_sql_Statement_Base::close( ) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -202,7 +202,7 @@ void SAL_CALL java_sql_Statement_Base::close( ) throw(css::sdbc::SQLException, } -void SAL_CALL java_sql_Statement::clearBatch( ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +void SAL_CALL java_sql_Statement::clearBatch( ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); { @@ -214,7 +214,7 @@ void SAL_CALL java_sql_Statement::clearBatch( ) throw(css::sdbc::SQLException, } -sal_Bool SAL_CALL java_sql_Statement_Base::execute( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_Statement_Base::execute( const OUString& sql ) { m_aLogger.log( LogLevel::FINE, STR_LOG_EXECUTE_STATEMENT, sql ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -248,7 +248,7 @@ sal_Bool SAL_CALL java_sql_Statement_Base::execute( const OUString& sql ) throw( } -Reference< XResultSet > SAL_CALL java_sql_Statement_Base::executeQuery( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL java_sql_Statement_Base::executeQuery( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -283,7 +283,7 @@ Reference< XResultSet > SAL_CALL java_sql_Statement_Base::executeQuery( const OU return out==nullptr ? nullptr : new java_sql_ResultSet( t.pEnv, out, m_aLogger, *m_pConnection,this ); } -Reference< XConnection > SAL_CALL java_sql_Statement_Base::getConnection( ) throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > SAL_CALL java_sql_Statement_Base::getConnection( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -291,14 +291,14 @@ Reference< XConnection > SAL_CALL java_sql_Statement_Base::getConnection( ) thr } -Any SAL_CALL java_sql_Statement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL java_sql_Statement::queryInterface( const Type & rType ) { Any aRet = ::cppu::queryInterface(rType,static_cast< XBatchExecution*> (this)); return aRet.hasValue() ? aRet : java_sql_Statement_Base::queryInterface(rType); } -void SAL_CALL java_sql_Statement::addBatch( const OUString& sql ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +void SAL_CALL java_sql_Statement::addBatch( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -311,7 +311,7 @@ void SAL_CALL java_sql_Statement::addBatch( const OUString& sql ) throw(css::sdb } -Sequence< sal_Int32 > SAL_CALL java_sql_Statement::executeBatch( ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +Sequence< sal_Int32 > SAL_CALL java_sql_Statement::executeBatch( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -331,7 +331,7 @@ Sequence< sal_Int32 > SAL_CALL java_sql_Statement::executeBatch( ) throw(css::s } -sal_Int32 SAL_CALL java_sql_Statement_Base::executeUpdate( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_Statement_Base::executeUpdate( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -345,7 +345,7 @@ sal_Int32 SAL_CALL java_sql_Statement_Base::executeUpdate( const OUString& sql ) } -Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Statement_Base::getResultSet( ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Statement_Base::getResultSet( ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -357,7 +357,7 @@ Reference< css::sdbc::XResultSet > SAL_CALL java_sql_Statement_Base::getResultSe } -sal_Int32 SAL_CALL java_sql_Statement_Base::getUpdateCount( ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_Statement_Base::getUpdateCount( ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); createStatement(t.pEnv); @@ -368,14 +368,14 @@ sal_Int32 SAL_CALL java_sql_Statement_Base::getUpdateCount( ) throw(css::sdbc:: } -sal_Bool SAL_CALL java_sql_Statement_Base::getMoreResults( ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_Statement_Base::getMoreResults( ) { static jmethodID mID(nullptr); return callBooleanMethod( "getMoreResults", mID ); } -Any SAL_CALL java_sql_Statement_Base::getWarnings( ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +Any SAL_CALL java_sql_Statement_Base::getWarnings( ) { SDBThreadAttach t; createStatement(t.pEnv); @@ -393,7 +393,7 @@ Any SAL_CALL java_sql_Statement_Base::getWarnings( ) throw(css::sdbc::SQLExcept return Any(); } -void SAL_CALL java_sql_Statement_Base::clearWarnings( ) throw(css::sdbc::SQLException, RuntimeException, std::exception) +void SAL_CALL java_sql_Statement_Base::clearWarnings( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -406,26 +406,26 @@ void SAL_CALL java_sql_Statement_Base::clearWarnings( ) throw(css::sdbc::SQLExc } } -sal_Int32 java_sql_Statement_Base::getQueryTimeOut() throw(SQLException, RuntimeException) +sal_Int32 java_sql_Statement_Base::getQueryTimeOut() { static jmethodID mID(nullptr); return impl_getProperty("getQueryTimeOut",mID); } -sal_Int32 java_sql_Statement_Base::getMaxRows() throw(SQLException, RuntimeException) +sal_Int32 java_sql_Statement_Base::getMaxRows() { static jmethodID mID(nullptr); return impl_getProperty("getMaxRows",mID); } -sal_Int32 java_sql_Statement_Base::getResultSetConcurrency() throw(SQLException, RuntimeException) +sal_Int32 java_sql_Statement_Base::getResultSetConcurrency() { static jmethodID mID(nullptr); return impl_getProperty("getResultSetConcurrency",mID,m_nResultSetConcurrency); } -sal_Int32 java_sql_Statement_Base::getResultSetType() throw(SQLException, RuntimeException) +sal_Int32 java_sql_Statement_Base::getResultSetType() { static jmethodID mID(nullptr); return impl_getProperty("getResultSetType",mID,m_nResultSetType); @@ -446,25 +446,25 @@ sal_Int32 java_sql_Statement_Base::impl_getProperty(const char* _pMethodName, jm return callIntMethod_ThrowRuntime(_pMethodName, _inout_MethodID); } -sal_Int32 java_sql_Statement_Base::getFetchDirection() throw(SQLException, RuntimeException) +sal_Int32 java_sql_Statement_Base::getFetchDirection() { static jmethodID mID(nullptr); return impl_getProperty("getFetchDirection",mID); } -sal_Int32 java_sql_Statement_Base::getFetchSize() throw(SQLException, RuntimeException) +sal_Int32 java_sql_Statement_Base::getFetchSize() { static jmethodID mID(nullptr); return impl_getProperty("getFetchSize",mID); } -sal_Int32 java_sql_Statement_Base::getMaxFieldSize() throw(SQLException, RuntimeException) +sal_Int32 java_sql_Statement_Base::getMaxFieldSize() { static jmethodID mID(nullptr); return impl_getProperty("getMaxFieldSize",mID); } -OUString java_sql_Statement_Base::getCursorName() throw(SQLException, RuntimeException) +OUString java_sql_Statement_Base::getCursorName() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -481,7 +481,7 @@ OUString java_sql_Statement_Base::getCursorName() throw(SQLException, RuntimeExc return OUString(); } -void java_sql_Statement_Base::setQueryTimeOut(sal_Int32 _par0) throw(SQLException, RuntimeException) +void java_sql_Statement_Base::setQueryTimeOut(sal_Int32 _par0) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -492,7 +492,7 @@ void java_sql_Statement_Base::setQueryTimeOut(sal_Int32 _par0) throw(SQLExceptio } -void java_sql_Statement_Base::setEscapeProcessing(bool _par0) throw(SQLException, RuntimeException) +void java_sql_Statement_Base::setEscapeProcessing(bool _par0) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -505,7 +505,7 @@ void java_sql_Statement_Base::setEscapeProcessing(bool _par0) throw(SQLException callVoidMethodWithBoolArg_ThrowRuntime("setEscapeProcessing", mID, _par0); } -void java_sql_Statement_Base::setMaxRows(sal_Int32 _par0) throw(SQLException, RuntimeException) +void java_sql_Statement_Base::setMaxRows(sal_Int32 _par0) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -515,7 +515,7 @@ void java_sql_Statement_Base::setMaxRows(sal_Int32 _par0) throw(SQLException, Ru callVoidMethodWithIntArg_ThrowRuntime("setMaxRows", mID, _par0); } -void java_sql_Statement_Base::setResultSetConcurrency(sal_Int32 _par0) throw(SQLException, RuntimeException) +void java_sql_Statement_Base::setResultSetConcurrency(sal_Int32 _par0) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -525,7 +525,7 @@ void java_sql_Statement_Base::setResultSetConcurrency(sal_Int32 _par0) throw(SQL clearObject(); } -void java_sql_Statement_Base::setResultSetType(sal_Int32 _par0) throw(SQLException, RuntimeException) +void java_sql_Statement_Base::setResultSetType(sal_Int32 _par0) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -535,7 +535,7 @@ void java_sql_Statement_Base::setResultSetType(sal_Int32 _par0) throw(SQLExcepti clearObject(); } -void java_sql_Statement_Base::setFetchDirection(sal_Int32 _par0) throw(SQLException, RuntimeException) +void java_sql_Statement_Base::setFetchDirection(sal_Int32 _par0) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -546,7 +546,7 @@ void java_sql_Statement_Base::setFetchDirection(sal_Int32 _par0) throw(SQLExcept callVoidMethodWithIntArg_ThrowRuntime("setFetchDirection", mID, _par0); } -void java_sql_Statement_Base::setFetchSize(sal_Int32 _par0) throw(SQLException, RuntimeException) +void java_sql_Statement_Base::setFetchSize(sal_Int32 _par0) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -558,7 +558,7 @@ void java_sql_Statement_Base::setFetchSize(sal_Int32 _par0) throw(SQLException, callVoidMethodWithIntArg_ThrowRuntime("setFetchSize", mID, _par0); } -void java_sql_Statement_Base::setMaxFieldSize(sal_Int32 _par0) throw(SQLException, RuntimeException) +void java_sql_Statement_Base::setMaxFieldSize(sal_Int32 _par0) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -568,7 +568,7 @@ void java_sql_Statement_Base::setMaxFieldSize(sal_Int32 _par0) throw(SQLExceptio callVoidMethodWithIntArg_ThrowRuntime("setMaxFieldSize", mID, _par0); } -void java_sql_Statement_Base::setCursorName(const OUString &_par0) throw(SQLException, RuntimeException) +void java_sql_Statement_Base::setCursorName(const OUString &_par0) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -622,7 +622,6 @@ sal_Bool java_sql_Statement_Base::convertFastPropertyValue( Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) - throw (css::lang::IllegalArgumentException) { try { @@ -667,7 +666,6 @@ void java_sql_Statement_Base::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& rValue ) - throw (Exception, std::exception) { switch(nHandle) { @@ -823,7 +821,7 @@ void SAL_CALL java_sql_Statement::release() throw() OStatement_BASE2::release(); } -css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL java_sql_Statement_Base::getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL java_sql_Statement_Base::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/jdbc/PreparedStatement.cxx b/connectivity/source/drivers/jdbc/PreparedStatement.cxx index 526cda6c1c42..ee084a45a6b1 100644 --- a/connectivity/source/drivers/jdbc/PreparedStatement.cxx +++ b/connectivity/source/drivers/jdbc/PreparedStatement.cxx @@ -71,7 +71,7 @@ jclass java_sql_PreparedStatement::getMyClass() const } -css::uno::Any SAL_CALL java_sql_PreparedStatement::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) +css::uno::Any SAL_CALL java_sql_PreparedStatement::queryInterface( const css::uno::Type & rType ) { css::uno::Any aRet = OStatement_BASE2::queryInterface(rType); return aRet.hasValue() ? aRet : ::cppu::queryInterface( rType, @@ -81,7 +81,7 @@ css::uno::Any SAL_CALL java_sql_PreparedStatement::queryInterface( const css::un static_cast< XPreparedBatchExecution*>(this)); } -css::uno::Sequence< css::uno::Type > SAL_CALL java_sql_PreparedStatement::getTypes( ) throw(css::uno::RuntimeException, std::exception) +css::uno::Sequence< css::uno::Type > SAL_CALL java_sql_PreparedStatement::getTypes( ) { ::cppu::OTypeCollection aTypes( cppu::UnoType::get(), cppu::UnoType::get(), @@ -92,7 +92,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL java_sql_PreparedStatement::getTyp } -sal_Bool SAL_CALL java_sql_PreparedStatement::execute( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_PreparedStatement::execute( ) { m_aLogger.log( LogLevel::FINE, STR_LOG_EXECUTING_PREPARED ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -105,7 +105,7 @@ sal_Bool SAL_CALL java_sql_PreparedStatement::execute( ) throw(css::sdbc::SQLEx } -sal_Int32 SAL_CALL java_sql_PreparedStatement::executeUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_PreparedStatement::executeUpdate( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -118,7 +118,7 @@ sal_Int32 SAL_CALL java_sql_PreparedStatement::executeUpdate( ) throw(css::sdbc } -void SAL_CALL java_sql_PreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -140,13 +140,13 @@ void SAL_CALL java_sql_PreparedStatement::setString( sal_Int32 parameterIndex, c } -css::uno::Reference< css::sdbc::XConnection > SAL_CALL java_sql_PreparedStatement::getConnection( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +css::uno::Reference< css::sdbc::XConnection > SAL_CALL java_sql_PreparedStatement::getConnection( ) { return Reference< XConnection >(m_pConnection.get()); } -css::uno::Reference< css::sdbc::XResultSet > SAL_CALL java_sql_PreparedStatement::executeQuery( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +css::uno::Reference< css::sdbc::XResultSet > SAL_CALL java_sql_PreparedStatement::executeQuery( ) { m_aLogger.log( LogLevel::FINE, STR_LOG_EXECUTING_PREPARED_QUERY ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -161,7 +161,7 @@ css::uno::Reference< css::sdbc::XResultSet > SAL_CALL java_sql_PreparedStatement } -void SAL_CALL java_sql_PreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) { m_aLogger.log( LogLevel::FINER, STR_LOG_BOOLEAN_PARAMETER, parameterIndex, bool(x) ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -174,7 +174,7 @@ void SAL_CALL java_sql_PreparedStatement::setBoolean( sal_Int32 parameterIndex, } -void SAL_CALL java_sql_PreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setByte( sal_Int32 parameterIndex, sal_Int8 x ) { m_aLogger.log( LogLevel::FINER, STR_LOG_BYTE_PARAMETER, parameterIndex, (sal_Int32)x ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -187,7 +187,7 @@ void SAL_CALL java_sql_PreparedStatement::setByte( sal_Int32 parameterIndex, sal } -void SAL_CALL java_sql_PreparedStatement::setDate( sal_Int32 parameterIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setDate( sal_Int32 parameterIndex, const css::util::Date& x ) { m_aLogger.log( LogLevel::FINER, STR_LOG_DATE_PARAMETER, parameterIndex, x ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -201,7 +201,7 @@ void SAL_CALL java_sql_PreparedStatement::setDate( sal_Int32 parameterIndex, con } -void SAL_CALL java_sql_PreparedStatement::setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setTime( sal_Int32 parameterIndex, const css::util::Time& x ) { m_aLogger.log( LogLevel::FINER, STR_LOG_TIME_PARAMETER, parameterIndex, x ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -215,7 +215,7 @@ void SAL_CALL java_sql_PreparedStatement::setTime( sal_Int32 parameterIndex, con } -void SAL_CALL java_sql_PreparedStatement::setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) { m_aLogger.log( LogLevel::FINER, STR_LOG_TIMESTAMP_PARAMETER, parameterIndex, x ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -228,7 +228,7 @@ void SAL_CALL java_sql_PreparedStatement::setTimestamp( sal_Int32 parameterIndex callVoidMethod_ThrowSQL("setTimestamp", "(ILjava/sql/Timestamp;)V", mID, parameterIndex, aD.getJavaObject()); } -void SAL_CALL java_sql_PreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) { m_aLogger.log( LogLevel::FINER, STR_LOG_DOUBLE_PARAMETER, parameterIndex, x ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -241,7 +241,7 @@ void SAL_CALL java_sql_PreparedStatement::setDouble( sal_Int32 parameterIndex, d } -void SAL_CALL java_sql_PreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) { m_aLogger.log( LogLevel::FINER, STR_LOG_FLOAT_PARAMETER, parameterIndex, x ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -254,7 +254,7 @@ void SAL_CALL java_sql_PreparedStatement::setFloat( sal_Int32 parameterIndex, fl } -void SAL_CALL java_sql_PreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x ) { m_aLogger.log( LogLevel::FINER, STR_LOG_INT_PARAMETER, parameterIndex, x ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -267,7 +267,7 @@ void SAL_CALL java_sql_PreparedStatement::setInt( sal_Int32 parameterIndex, sal_ } -void SAL_CALL java_sql_PreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x ) { m_aLogger.log( LogLevel::FINER, STR_LOG_LONG_PARAMETER, parameterIndex, x ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -280,7 +280,7 @@ void SAL_CALL java_sql_PreparedStatement::setLong( sal_Int32 parameterIndex, sal } -void SAL_CALL java_sql_PreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) { m_aLogger.log( LogLevel::FINER, STR_LOG_NULL_PARAMETER, parameterIndex, sqlType ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -293,31 +293,31 @@ void SAL_CALL java_sql_PreparedStatement::setNull( sal_Int32 parameterIndex, sal } -void SAL_CALL java_sql_PreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const css::uno::Reference< css::sdbc::XClob >& /*x*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const css::uno::Reference< css::sdbc::XClob >& /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setClob", *this ); } -void SAL_CALL java_sql_PreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const css::uno::Reference< css::sdbc::XBlob >& /*x*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const css::uno::Reference< css::sdbc::XBlob >& /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setBlob", *this ); } -void SAL_CALL java_sql_PreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const css::uno::Reference< css::sdbc::XArray >& /*x*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const css::uno::Reference< css::sdbc::XArray >& /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setArray", *this ); } -void SAL_CALL java_sql_PreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const css::uno::Reference< css::sdbc::XRef >& /*x*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const css::uno::Reference< css::sdbc::XRef >& /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setRef", *this ); } -void SAL_CALL java_sql_PreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) { m_aLogger.log( LogLevel::FINER, STR_LOG_OBJECT_NULL_PARAMETER, parameterIndex ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -377,7 +377,7 @@ void SAL_CALL java_sql_PreparedStatement::setObjectWithInfo( sal_Int32 parameter } -void SAL_CALL java_sql_PreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/, const OUString& /*typeName*/ ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/, const OUString& /*typeName*/ ) { m_aLogger.log( LogLevel::FINER, STR_LOG_OBJECT_NULL_PARAMETER, parameterIndex ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -390,7 +390,7 @@ void SAL_CALL java_sql_PreparedStatement::setObjectNull( sal_Int32 parameterInde } -void SAL_CALL java_sql_PreparedStatement::setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) { if(!::dbtools::implSetObject(this,parameterIndex,x)) { @@ -403,7 +403,7 @@ void SAL_CALL java_sql_PreparedStatement::setObject( sal_Int32 parameterIndex, c } -void SAL_CALL java_sql_PreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x ) { m_aLogger.log( LogLevel::FINER, STR_LOG_SHORT_PARAMETER, parameterIndex, x ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -416,7 +416,7 @@ void SAL_CALL java_sql_PreparedStatement::setShort( sal_Int32 parameterIndex, sa } -void SAL_CALL java_sql_PreparedStatement::setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) { m_aLogger.log( LogLevel::FINER, STR_LOG_BYTES_PARAMETER, parameterIndex ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -449,7 +449,7 @@ void SAL_CALL java_sql_PreparedStatement::setBytes( sal_Int32 parameterIndex, co } -void SAL_CALL java_sql_PreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) { m_aLogger.log( LogLevel::FINER, STR_LOG_CHARSTREAM_PARAMETER, parameterIndex ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -508,7 +508,7 @@ void SAL_CALL java_sql_PreparedStatement::setCharacterStream( sal_Int32 paramete } -void SAL_CALL java_sql_PreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) { m_aLogger.log( LogLevel::FINER, STR_LOG_BINARYSTREAM_PARAMETER, parameterIndex ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -567,7 +567,7 @@ void SAL_CALL java_sql_PreparedStatement::setBinaryStream( sal_Int32 parameterIn } -void SAL_CALL java_sql_PreparedStatement::clearParameters( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::clearParameters( ) { m_aLogger.log( LogLevel::FINER, STR_LOG_CLEAR_PARAMETERS ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -582,7 +582,7 @@ void SAL_CALL java_sql_PreparedStatement::clearParameters( ) throw(css::sdbc::S } //t.pEnv } -void SAL_CALL java_sql_PreparedStatement::clearBatch( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::clearBatch( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -595,7 +595,7 @@ void SAL_CALL java_sql_PreparedStatement::clearBatch( ) throw(css::sdbc::SQLExc } -void SAL_CALL java_sql_PreparedStatement::addBatch( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_PreparedStatement::addBatch( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -608,7 +608,7 @@ void SAL_CALL java_sql_PreparedStatement::addBatch( ) throw(css::sdbc::SQLExcept } -css::uno::Sequence< sal_Int32 > SAL_CALL java_sql_PreparedStatement::executeBatch( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +css::uno::Sequence< sal_Int32 > SAL_CALL java_sql_PreparedStatement::executeBatch( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); @@ -627,7 +627,7 @@ css::uno::Sequence< sal_Int32 > SAL_CALL java_sql_PreparedStatement::executeBatc return aSeq; } -css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL java_sql_PreparedStatement::getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL java_sql_PreparedStatement::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(java_sql_Statement_BASE::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/jdbc/Reader.cxx b/connectivity/source/drivers/jdbc/Reader.cxx index 665caaf381d9..10c3e29341c2 100644 --- a/connectivity/source/drivers/jdbc/Reader.cxx +++ b/connectivity/source/drivers/jdbc/Reader.cxx @@ -45,12 +45,12 @@ jclass java_io_Reader::getMyClass() const return theClass; } -sal_Int32 SAL_CALL java_io_Reader::readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL java_io_Reader::readSomeBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nMaxBytesToRead ) { return readBytes(aData,nMaxBytesToRead); } -void SAL_CALL java_io_Reader::skipBytes( sal_Int32 nBytesToSkip ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_io_Reader::skipBytes( sal_Int32 nBytesToSkip ) { static jmethodID mID(nullptr); if(nBytesToSkip <= 0) @@ -74,7 +74,7 @@ void SAL_CALL java_io_Reader::skipBytes( sal_Int32 nBytesToSkip ) throw(css::io: } } -sal_Int32 SAL_CALL java_io_Reader::available( ) throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL java_io_Reader::available( ) { if(m_buf != boost::none) return 1; @@ -93,13 +93,13 @@ sal_Int32 SAL_CALL java_io_Reader::available( ) throw(css::io::NotConnectedExce return (m_buf != boost::none ? 1 : 0) + (out ? 1 : 0); // no way to tell *how much* is ready } -void SAL_CALL java_io_Reader::closeInput( ) throw(css::io::NotConnectedException, css::io::IOException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_io_Reader::closeInput( ) { static jmethodID mID(nullptr); callVoidMethod_ThrowRuntime("close", mID); } -sal_Int32 SAL_CALL java_io_Reader::readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(css::io::NotConnectedException, css::io::BufferSizeExceededException, css::io::IOException, css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL java_io_Reader::readBytes( css::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) { OSL_ENSURE(aData.getLength() >= nBytesToRead," Sequence is smaller than BytesToRead"); diff --git a/connectivity/source/drivers/jdbc/Ref.cxx b/connectivity/source/drivers/jdbc/Ref.cxx index 84cf5f765457..c22001d6c477 100644 --- a/connectivity/source/drivers/jdbc/Ref.cxx +++ b/connectivity/source/drivers/jdbc/Ref.cxx @@ -43,7 +43,7 @@ jclass java_sql_Ref::getMyClass() const return theClass; } -OUString SAL_CALL java_sql_Ref::getBaseTypeName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +OUString SAL_CALL java_sql_Ref::getBaseTypeName( ) { static jmethodID mID(nullptr); return callStringMethod("getBaseTypeName",mID); diff --git a/connectivity/source/drivers/jdbc/ResultSet.cxx b/connectivity/source/drivers/jdbc/ResultSet.cxx index 3550d736fbe1..ec446f973c5e 100644 --- a/connectivity/source/drivers/jdbc/ResultSet.cxx +++ b/connectivity/source/drivers/jdbc/ResultSet.cxx @@ -113,13 +113,13 @@ m_xMetaData.clear(); SDBThreadAttach::releaseRef(); } -css::uno::Any SAL_CALL java_sql_ResultSet::queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) +css::uno::Any SAL_CALL java_sql_ResultSet::queryInterface( const css::uno::Type & rType ) { css::uno::Any aRet = OPropertySetHelper::queryInterface(rType); return aRet.hasValue() ? aRet : java_sql_ResultSet_BASE::queryInterface(rType); } -css::uno::Sequence< css::uno::Type > SAL_CALL java_sql_ResultSet::getTypes( ) throw(css::uno::RuntimeException, std::exception) +css::uno::Sequence< css::uno::Type > SAL_CALL java_sql_ResultSet::getTypes( ) { ::cppu::OTypeCollection aTypes( cppu::UnoType::get(), cppu::UnoType::get(), @@ -129,13 +129,13 @@ css::uno::Sequence< css::uno::Type > SAL_CALL java_sql_ResultSet::getTypes( ) t } -sal_Int32 SAL_CALL java_sql_ResultSet::findColumn( const OUString& columnName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_ResultSet::findColumn( const OUString& columnName ) { static jmethodID mID(nullptr); return callIntMethodWithStringArg("findColumn",mID,columnName); } -Reference< css::io::XInputStream > SAL_CALL java_sql_ResultSet::getBinaryStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Reference< css::io::XInputStream > SAL_CALL java_sql_ResultSet::getBinaryStream( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); static jmethodID mID(nullptr); @@ -145,7 +145,7 @@ Reference< css::io::XInputStream > SAL_CALL java_sql_ResultSet::getBinaryStream( return out==nullptr ? nullptr : new java_io_InputStream( t.pEnv, out ); } -Reference< css::io::XInputStream > SAL_CALL java_sql_ResultSet::getCharacterStream( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Reference< css::io::XInputStream > SAL_CALL java_sql_ResultSet::getCharacterStream( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); static jmethodID mID(nullptr); @@ -156,14 +156,14 @@ Reference< css::io::XInputStream > SAL_CALL java_sql_ResultSet::getCharacterStre } -sal_Bool SAL_CALL java_sql_ResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSet::getBoolean( sal_Int32 columnIndex ) { static jmethodID mID(nullptr); return callBooleanMethodWithIntArg( "getBoolean", mID,columnIndex ); } -sal_Int8 SAL_CALL java_sql_ResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int8 SAL_CALL java_sql_ResultSet::getByte( sal_Int32 columnIndex ) { static jmethodID mID(nullptr); jbyte (JNIEnv::*pCallMethod)( jobject obj, jmethodID methodID, ... ) = &JNIEnv::CallByteMethod; @@ -171,7 +171,7 @@ sal_Int8 SAL_CALL java_sql_ResultSet::getByte( sal_Int32 columnIndex ) throw(SQL } -Sequence< sal_Int8 > SAL_CALL java_sql_ResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Sequence< sal_Int8 > SAL_CALL java_sql_ResultSet::getBytes( sal_Int32 columnIndex ) { Sequence< sal_Int8 > aSeq; SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); @@ -188,7 +188,7 @@ Sequence< sal_Int8 > SAL_CALL java_sql_ResultSet::getBytes( sal_Int32 columnInde } -css::util::Date SAL_CALL java_sql_ResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::Date SAL_CALL java_sql_ResultSet::getDate( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); static jmethodID mID(nullptr); @@ -198,7 +198,7 @@ css::util::Date SAL_CALL java_sql_ResultSet::getDate( sal_Int32 columnIndex ) th } -double SAL_CALL java_sql_ResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +double SAL_CALL java_sql_ResultSet::getDouble( sal_Int32 columnIndex ) { static jmethodID mID(nullptr); jdouble (JNIEnv::*pCallMethod)( jobject obj, jmethodID methodID, ... ) = &JNIEnv::CallDoubleMethod; @@ -206,7 +206,7 @@ double SAL_CALL java_sql_ResultSet::getDouble( sal_Int32 columnIndex ) throw(SQL } -float SAL_CALL java_sql_ResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +float SAL_CALL java_sql_ResultSet::getFloat( sal_Int32 columnIndex ) { static jmethodID mID(nullptr); jfloat (JNIEnv::*pCallMethod)( jobject obj, jmethodID methodID, ... ) = &JNIEnv::CallFloatMethod; @@ -214,21 +214,21 @@ float SAL_CALL java_sql_ResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLEx } -sal_Int32 SAL_CALL java_sql_ResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_ResultSet::getInt( sal_Int32 columnIndex ) { static jmethodID mID(nullptr); return callIntMethodWithIntArg_ThrowSQL("getInt",mID,columnIndex); } -sal_Int32 SAL_CALL java_sql_ResultSet::getRow( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_ResultSet::getRow( ) { static jmethodID mID(nullptr); return callIntMethod_ThrowSQL("getRow", mID); } -sal_Int64 SAL_CALL java_sql_ResultSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int64 SAL_CALL java_sql_ResultSet::getLong( sal_Int32 columnIndex ) { static jmethodID mID(nullptr); jlong (JNIEnv::*pCallMethod)( jobject obj, jmethodID methodID, ... ) = &JNIEnv::CallLongMethod; @@ -236,7 +236,7 @@ sal_Int64 SAL_CALL java_sql_ResultSet::getLong( sal_Int32 columnIndex ) throw(SQ } -css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL java_sql_ResultSet::getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL java_sql_ResultSet::getMetaData( ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); static jmethodID mID(nullptr); @@ -245,7 +245,7 @@ css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL java_sql_ResultSet return out==nullptr ? nullptr : new java_sql_ResultSetMetaData( t.pEnv, out, *m_pConnection ); } -Reference< XArray > SAL_CALL java_sql_ResultSet::getArray( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Reference< XArray > SAL_CALL java_sql_ResultSet::getArray( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); static jmethodID mID(nullptr); @@ -256,7 +256,7 @@ Reference< XArray > SAL_CALL java_sql_ResultSet::getArray( sal_Int32 columnIndex } -Reference< XClob > SAL_CALL java_sql_ResultSet::getClob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Reference< XClob > SAL_CALL java_sql_ResultSet::getClob( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); static jmethodID mID(nullptr); @@ -265,7 +265,7 @@ Reference< XClob > SAL_CALL java_sql_ResultSet::getClob( sal_Int32 columnIndex ) return out==nullptr ? nullptr : new java_sql_Clob( t.pEnv, out ); } -Reference< XBlob > SAL_CALL java_sql_ResultSet::getBlob( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Reference< XBlob > SAL_CALL java_sql_ResultSet::getBlob( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); static jmethodID mID(nullptr); @@ -275,7 +275,7 @@ Reference< XBlob > SAL_CALL java_sql_ResultSet::getBlob( sal_Int32 columnIndex ) } -Reference< XRef > SAL_CALL java_sql_ResultSet::getRef( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Reference< XRef > SAL_CALL java_sql_ResultSet::getRef( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); static jmethodID mID(nullptr); @@ -286,7 +286,7 @@ Reference< XRef > SAL_CALL java_sql_ResultSet::getRef( sal_Int32 columnIndex ) t } -Any SAL_CALL java_sql_ResultSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL java_sql_ResultSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& typeMap ) { jobject out(nullptr); Any aRet; @@ -347,7 +347,7 @@ Any SAL_CALL java_sql_ResultSet::getObject( sal_Int32 columnIndex, const Referen } -sal_Int16 SAL_CALL java_sql_ResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int16 SAL_CALL java_sql_ResultSet::getShort( sal_Int32 columnIndex ) { static jmethodID mID(nullptr); jshort (JNIEnv::*pCallMethod)( jobject obj, jmethodID methodID, ... ) = &JNIEnv::CallShortMethod; @@ -355,14 +355,14 @@ sal_Int16 SAL_CALL java_sql_ResultSet::getShort( sal_Int32 columnIndex ) throw(S } -OUString SAL_CALL java_sql_ResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_ResultSet::getString( sal_Int32 columnIndex ) { static jmethodID mID(nullptr); return callStringMethodWithIntArg("getString",mID,columnIndex); } -css::util::Time SAL_CALL java_sql_ResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::Time SAL_CALL java_sql_ResultSet::getTime( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); static jmethodID mID(nullptr); @@ -372,7 +372,7 @@ css::util::Time SAL_CALL java_sql_ResultSet::getTime( sal_Int32 columnIndex ) th } -css::util::DateTime SAL_CALL java_sql_ResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::DateTime SAL_CALL java_sql_ResultSet::getTimestamp( sal_Int32 columnIndex ) { SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!"); static jmethodID mID(nullptr); @@ -382,131 +382,131 @@ css::util::DateTime SAL_CALL java_sql_ResultSet::getTimestamp( sal_Int32 columnI } -sal_Bool SAL_CALL java_sql_ResultSet::isAfterLast( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSet::isAfterLast( ) { static jmethodID mID(nullptr); return callBooleanMethod( "isAfterLast", mID ); } -sal_Bool SAL_CALL java_sql_ResultSet::isFirst( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSet::isFirst( ) { static jmethodID mID(nullptr); return callBooleanMethod( "isFirst", mID ); } -sal_Bool SAL_CALL java_sql_ResultSet::isLast( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSet::isLast( ) { static jmethodID mID(nullptr); return callBooleanMethod( "isLast", mID ); } -void SAL_CALL java_sql_ResultSet::beforeFirst( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::beforeFirst( ) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("beforeFirst", mID); } -void SAL_CALL java_sql_ResultSet::afterLast( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::afterLast( ) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("afterLast", mID); } -void SAL_CALL java_sql_ResultSet::close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::close( ) { dispose(); } -sal_Bool SAL_CALL java_sql_ResultSet::first( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSet::first( ) { static jmethodID mID(nullptr); return callBooleanMethod( "first", mID ); } -sal_Bool SAL_CALL java_sql_ResultSet::last( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSet::last( ) { static jmethodID mID(nullptr); return callBooleanMethod( "last", mID ); } -sal_Bool SAL_CALL java_sql_ResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSet::absolute( sal_Int32 row ) { static jmethodID mID(nullptr); return callBooleanMethodWithIntArg( "absolute", mID,row ); } -sal_Bool SAL_CALL java_sql_ResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSet::relative( sal_Int32 row ) { static jmethodID mID(nullptr); return callBooleanMethodWithIntArg( "relative", mID,row ); } -sal_Bool SAL_CALL java_sql_ResultSet::previous( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSet::previous( ) { static jmethodID mID(nullptr); return callBooleanMethod( "previous", mID ); } -Reference< XInterface > SAL_CALL java_sql_ResultSet::getStatement( ) throw(SQLException, RuntimeException, std::exception) +Reference< XInterface > SAL_CALL java_sql_ResultSet::getStatement( ) { return m_xStatement; } -sal_Bool SAL_CALL java_sql_ResultSet::rowDeleted( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSet::rowDeleted( ) { static jmethodID mID(nullptr); return callBooleanMethod( "rowDeleted", mID ); } -sal_Bool SAL_CALL java_sql_ResultSet::rowInserted( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSet::rowInserted( ) { static jmethodID mID(nullptr); return callBooleanMethod( "rowInserted", mID ); } -sal_Bool SAL_CALL java_sql_ResultSet::rowUpdated( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSet::rowUpdated( ) { static jmethodID mID(nullptr); return callBooleanMethod( "rowUpdated", mID ); } -sal_Bool SAL_CALL java_sql_ResultSet::isBeforeFirst( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSet::isBeforeFirst( ) { static jmethodID mID(nullptr); return callBooleanMethod( "isBeforeFirst", mID ); } -sal_Bool SAL_CALL java_sql_ResultSet::next( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSet::next( ) { static jmethodID mID(nullptr); return callBooleanMethod( "next", mID ); } -sal_Bool SAL_CALL java_sql_ResultSet::wasNull( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSet::wasNull( ) { static jmethodID mID(nullptr); return callBooleanMethod( "wasNull", mID ); } -void SAL_CALL java_sql_ResultSet::cancel( ) throw(css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::cancel( ) { static jmethodID mID(nullptr); callVoidMethod_ThrowRuntime("cancel", mID); } -void SAL_CALL java_sql_ResultSet::clearWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::clearWarnings( ) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("clearWarnings", mID); } -css::uno::Any SAL_CALL java_sql_ResultSet::getWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +css::uno::Any SAL_CALL java_sql_ResultSet::getWarnings( ) { SDBThreadAttach t; static jmethodID mID(nullptr); @@ -524,100 +524,100 @@ css::uno::Any SAL_CALL java_sql_ResultSet::getWarnings( ) throw(css::sdbc::SQLE } -void SAL_CALL java_sql_ResultSet::insertRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::insertRow( ) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("insertRow", mID); } -void SAL_CALL java_sql_ResultSet::updateRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateRow( ) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("updateRow", mID); } -void SAL_CALL java_sql_ResultSet::deleteRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::deleteRow( ) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("deleteRow", mID); } -void SAL_CALL java_sql_ResultSet::cancelRowUpdates( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::cancelRowUpdates( ) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("cancelRowUpdates", mID); } -void SAL_CALL java_sql_ResultSet::moveToInsertRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::moveToInsertRow( ) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("moveToInsertRow", mID); } -void SAL_CALL java_sql_ResultSet::moveToCurrentRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::moveToCurrentRow( ) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("moveToCurrentRow", mID); } -void SAL_CALL java_sql_ResultSet::updateNull( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateNull( sal_Int32 columnIndex ) { static jmethodID mID(nullptr); callVoidMethodWithIntArg_ThrowSQL("updateNull", mID, columnIndex); } -void SAL_CALL java_sql_ResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("updateBoolean", "(IZ)V", mID, columnIndex, x); } -void SAL_CALL java_sql_ResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("updateByte", "(IB)V", mID, columnIndex, x); } -void SAL_CALL java_sql_ResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("updateShort", "(IS)V", mID, columnIndex, x); } -void SAL_CALL java_sql_ResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("updateInt", "(II)V", mID, columnIndex, x); } -void SAL_CALL java_sql_ResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateLong( sal_Int32 columnIndex, sal_Int64 x ) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("updateLong", "(IJ)V", mID, columnIndex, x); } -void SAL_CALL java_sql_ResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateFloat( sal_Int32 columnIndex, float x ) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("updateFloat", "(IF)V", mID, columnIndex, x); } -void SAL_CALL java_sql_ResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateDouble( sal_Int32 columnIndex, double x ) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("updateDouble", "(ID)V", mID, columnIndex, x); } -void SAL_CALL java_sql_ResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) { SDBThreadAttach t; @@ -643,7 +643,7 @@ void SAL_CALL java_sql_ResultSet::updateString( sal_Int32 columnIndex, const OUS } -void SAL_CALL java_sql_ResultSet::updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) { SDBThreadAttach t; @@ -679,7 +679,7 @@ void SAL_CALL java_sql_ResultSet::updateBytes( sal_Int32 columnIndex, const css: } -void SAL_CALL java_sql_ResultSet::updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateDate( sal_Int32 columnIndex, const css::util::Date& x ) { java_sql_Date aD(x); static jmethodID mID(nullptr); @@ -687,7 +687,7 @@ void SAL_CALL java_sql_ResultSet::updateDate( sal_Int32 columnIndex, const css:: } -void SAL_CALL java_sql_ResultSet::updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateTime( sal_Int32 columnIndex, const css::util::Time& x ) { java_sql_Time aD(x); static jmethodID mID(nullptr); @@ -695,7 +695,7 @@ void SAL_CALL java_sql_ResultSet::updateTime( sal_Int32 columnIndex, const css:: } -void SAL_CALL java_sql_ResultSet::updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) { java_sql_Timestamp aD(x); static jmethodID mID(nullptr); @@ -703,7 +703,7 @@ void SAL_CALL java_sql_ResultSet::updateTimestamp( sal_Int32 columnIndex, const } -void SAL_CALL java_sql_ResultSet::updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) { try { @@ -734,7 +734,7 @@ void SAL_CALL java_sql_ResultSet::updateBinaryStream( sal_Int32 columnIndex, con } } -void SAL_CALL java_sql_ResultSet::updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) { try { @@ -765,7 +765,7 @@ void SAL_CALL java_sql_ResultSet::updateCharacterStream( sal_Int32 columnIndex, } } -void SAL_CALL java_sql_ResultSet::updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) { if(!::dbtools::implUpdateObject(this,columnIndex,x)) { @@ -779,7 +779,7 @@ void SAL_CALL java_sql_ResultSet::updateObject( sal_Int32 columnIndex, const css } -void SAL_CALL java_sql_ResultSet::updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) { // OSL_FAIL("java_sql_ResultSet::updateNumericObject: NYI"); try @@ -821,50 +821,50 @@ void SAL_CALL java_sql_ResultSet::updateNumericObject( sal_Int32 columnIndex, co } } -sal_Int32 java_sql_ResultSet::getResultSetConcurrency() const throw(css::sdbc::SQLException, css::uno::RuntimeException) +sal_Int32 java_sql_ResultSet::getResultSetConcurrency() const { static jmethodID mID(nullptr); return callIntMethod_ThrowRuntime("getConcurrency", mID); } -sal_Int32 java_sql_ResultSet::getResultSetType() const throw(css::sdbc::SQLException, css::uno::RuntimeException) +sal_Int32 java_sql_ResultSet::getResultSetType() const { static jmethodID mID(nullptr); return callIntMethod_ThrowRuntime("getType",mID); } -sal_Int32 java_sql_ResultSet::getFetchDirection() const throw(css::sdbc::SQLException, css::uno::RuntimeException) +sal_Int32 java_sql_ResultSet::getFetchDirection() const { static jmethodID mID(nullptr); return callIntMethod_ThrowRuntime("getFetchDirection", mID); } -sal_Int32 java_sql_ResultSet::getFetchSize() const throw(css::sdbc::SQLException, css::uno::RuntimeException) +sal_Int32 java_sql_ResultSet::getFetchSize() const { static jmethodID mID(nullptr); return callIntMethod_ThrowRuntime("getFetchSize", mID); } -OUString java_sql_ResultSet::getCursorName() const throw(css::sdbc::SQLException, css::uno::RuntimeException) +OUString java_sql_ResultSet::getCursorName() const { static jmethodID mID(nullptr); return callStringMethod("getCursorName",mID); } -void java_sql_ResultSet::setFetchDirection(sal_Int32 _par0) throw(css::sdbc::SQLException, css::uno::RuntimeException) +void java_sql_ResultSet::setFetchDirection(sal_Int32 _par0) { static jmethodID mID(nullptr); callVoidMethodWithIntArg_ThrowRuntime("setFetchDirection", mID, _par0); } -void SAL_CALL java_sql_ResultSet::refreshRow( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL java_sql_ResultSet::refreshRow( ) { static jmethodID mID(nullptr); callVoidMethod_ThrowSQL("refreshRow",mID); } -void java_sql_ResultSet::setFetchSize(sal_Int32 _par0) throw(css::sdbc::SQLException, css::uno::RuntimeException) +void java_sql_ResultSet::setFetchSize(sal_Int32 _par0) { static jmethodID mID(nullptr); callVoidMethodWithIntArg_ThrowRuntime("setFetchSize", mID, _par0); @@ -903,7 +903,6 @@ sal_Bool java_sql_ResultSet::convertFastPropertyValue( css::uno::Any & rOldValue, sal_Int32 nHandle, const css::uno::Any& rValue ) - throw (css::lang::IllegalArgumentException, css::uno::RuntimeException) { bool bRet = false; switch(nHandle) @@ -929,7 +928,6 @@ void java_sql_ResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue ) - throw (css::uno::Exception, std::exception) { switch(nHandle) { @@ -989,7 +987,7 @@ void SAL_CALL java_sql_ResultSet::release() throw() java_sql_ResultSet_BASE::release(); } -css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL java_sql_ResultSet::getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL java_sql_ResultSet::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx index c016717a7b32..4bc977b6bd54 100644 --- a/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx +++ b/connectivity/source/drivers/jdbc/ResultSetMetaData.cxx @@ -54,21 +54,21 @@ jclass java_sql_ResultSetMetaData::getMyClass() const } -sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) { static jmethodID mID(nullptr); return callIntMethodWithIntArg_ThrowSQL("getColumnDisplaySize",mID,column); } -sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnType( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnType( sal_Int32 column ) { static jmethodID mID(nullptr); return callIntMethodWithIntArg_ThrowSQL("getColumnType",mID,column); } -sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnCount( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnCount( ) { if ( m_nColumnCount == -1 ) { @@ -80,57 +80,57 @@ sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getColumnCount( ) throw(SQLExcep } -sal_Bool SAL_CALL java_sql_ResultSetMetaData::isCaseSensitive( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSetMetaData::isCaseSensitive( sal_Int32 column ) { static jmethodID mID(nullptr); return callBooleanMethodWithIntArg( "isCaseSensitive", mID,column ); } -OUString SAL_CALL java_sql_ResultSetMetaData::getSchemaName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_ResultSetMetaData::getSchemaName( sal_Int32 column ) { static jmethodID mID(nullptr); return callStringMethodWithIntArg("getSchemaName",mID,column); } -OUString SAL_CALL java_sql_ResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_ResultSetMetaData::getColumnName( sal_Int32 column ) { static jmethodID mID(nullptr); return callStringMethodWithIntArg("getColumnName",mID,column); } -OUString SAL_CALL java_sql_ResultSetMetaData::getTableName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_ResultSetMetaData::getTableName( sal_Int32 column ) { static jmethodID mID(nullptr); return callStringMethodWithIntArg("getTableName",mID,column); } -OUString SAL_CALL java_sql_ResultSetMetaData::getCatalogName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_ResultSetMetaData::getCatalogName( sal_Int32 column ) { static jmethodID mID(nullptr); return callStringMethodWithIntArg("getCatalogName",mID,column); } -OUString SAL_CALL java_sql_ResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_ResultSetMetaData::getColumnTypeName( sal_Int32 column ) { static jmethodID mID(nullptr); return callStringMethodWithIntArg("getColumnTypeName",mID,column); } -OUString SAL_CALL java_sql_ResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_ResultSetMetaData::getColumnLabel( sal_Int32 column ) { static jmethodID mID(nullptr); return callStringMethodWithIntArg("getColumnLabel",mID,column); } -OUString SAL_CALL java_sql_ResultSetMetaData::getColumnServiceName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL java_sql_ResultSetMetaData::getColumnServiceName( sal_Int32 column ) { static jmethodID mID(nullptr); return callStringMethodWithIntArg("getColumnClassName",mID,column); } -sal_Bool SAL_CALL java_sql_ResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSetMetaData::isCurrency( sal_Int32 column ) { if ( m_pConnection->isIgnoreCurrencyEnabled() ) return false; @@ -139,59 +139,59 @@ sal_Bool SAL_CALL java_sql_ResultSetMetaData::isCurrency( sal_Int32 column ) thr } -sal_Bool SAL_CALL java_sql_ResultSetMetaData::isAutoIncrement( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSetMetaData::isAutoIncrement( sal_Int32 column ) { static jmethodID mID(nullptr); return callBooleanMethodWithIntArg( "isAutoIncrement", mID,column ); } -sal_Bool SAL_CALL java_sql_ResultSetMetaData::isSigned( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSetMetaData::isSigned( sal_Int32 column ) { static jmethodID mID(nullptr); return callBooleanMethodWithIntArg( "isSigned", mID,column ); } -sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getPrecision( sal_Int32 column ) { static jmethodID mID(nullptr); return callIntMethodWithIntArg_ThrowSQL("getPrecision",mID,column); } -sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_ResultSetMetaData::getScale( sal_Int32 column ) { static jmethodID mID(nullptr); return callIntMethodWithIntArg_ThrowSQL("getScale",mID,column); } -sal_Int32 SAL_CALL java_sql_ResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL java_sql_ResultSetMetaData::isNullable( sal_Int32 column ) { static jmethodID mID(nullptr); return callIntMethodWithIntArg_ThrowSQL("isNullable",mID,column); } -sal_Bool SAL_CALL java_sql_ResultSetMetaData::isSearchable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSetMetaData::isSearchable( sal_Int32 column ) { static jmethodID mID(nullptr); return callBooleanMethodWithIntArg( "isSearchable", mID,column ); } -sal_Bool SAL_CALL java_sql_ResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSetMetaData::isReadOnly( sal_Int32 column ) { static jmethodID mID(nullptr); return callBooleanMethodWithIntArg( "isReadOnly", mID,column ); } -sal_Bool SAL_CALL java_sql_ResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) { static jmethodID mID(nullptr); return callBooleanMethodWithIntArg( "isDefinitelyWritable", mID,column ); } -sal_Bool SAL_CALL java_sql_ResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL java_sql_ResultSetMetaData::isWritable( sal_Int32 column ) { static jmethodID mID(nullptr); return callBooleanMethodWithIntArg( "isWritable", mID,column ); diff --git a/connectivity/source/drivers/jdbc/tools.cxx b/connectivity/source/drivers/jdbc/tools.cxx index f1759cd77eb4..58580ccc16d2 100644 --- a/connectivity/source/drivers/jdbc/tools.cxx +++ b/connectivity/source/drivers/jdbc/tools.cxx @@ -103,7 +103,7 @@ jstring connectivity::convertwchar_tToJavaString(JNIEnv *pEnv,const OUString& _r } -java_util_Properties* connectivity::createStringPropertyArray(const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) +java_util_Properties* connectivity::createStringPropertyArray(const Sequence< PropertyValue >& info ) { java_util_Properties* pProps = new java_util_Properties(); const PropertyValue* pBegin = info.getConstArray(); diff --git a/connectivity/source/drivers/kab/KCatalog.cxx b/connectivity/source/drivers/kab/KCatalog.cxx index 06cc13cface7..9d7926af2a8c 100644 --- a/connectivity/source/drivers/kab/KCatalog.cxx +++ b/connectivity/source/drivers/kab/KCatalog.cxx @@ -78,7 +78,7 @@ void KabCatalog::refreshUsers() // XTablesSupplier -Reference< XNameAccess > SAL_CALL KabCatalog::getTables( ) throw(RuntimeException, std::exception) +Reference< XNameAccess > SAL_CALL KabCatalog::getTables( ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); diff --git a/connectivity/source/drivers/kab/KCatalog.hxx b/connectivity/source/drivers/kab/KCatalog.hxx index c3c45faacdea..29b2580fc1b3 100644 --- a/connectivity/source/drivers/kab/KCatalog.hxx +++ b/connectivity/source/drivers/kab/KCatalog.hxx @@ -45,7 +45,7 @@ namespace connectivity // XTablesSupplier virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables( - ) throw(css::uno::RuntimeException, std::exception) override; + ) override; }; } } diff --git a/connectivity/source/drivers/kab/KColumns.cxx b/connectivity/source/drivers/kab/KColumns.cxx index fe675ade9fcf..c94726d55001 100644 --- a/connectivity/source/drivers/kab/KColumns.cxx +++ b/connectivity/source/drivers/kab/KColumns.cxx @@ -78,7 +78,7 @@ sdbcx::ObjectType KabColumns::createObject(const OUString& _rName) return xRet; } -void KabColumns::impl_refresh() throw(RuntimeException) +void KabColumns::impl_refresh() { m_pTable->refreshColumns(); } diff --git a/connectivity/source/drivers/kab/KColumns.hxx b/connectivity/source/drivers/kab/KColumns.hxx index 80145a8bd5f3..887048347d42 100644 --- a/connectivity/source/drivers/kab/KColumns.hxx +++ b/connectivity/source/drivers/kab/KColumns.hxx @@ -33,7 +33,7 @@ namespace connectivity KabTable* m_pTable; virtual sdbcx::ObjectType createObject(const OUString& _rName) override; - virtual void impl_refresh() throw(css::uno::RuntimeException) override; + virtual void impl_refresh() override; public: KabColumns( KabTable* _pTable, diff --git a/connectivity/source/drivers/kab/KConnection.cxx b/connectivity/source/drivers/kab/KConnection.cxx index 2b40d1d8bd4c..d7945bb7d88b 100644 --- a/connectivity/source/drivers/kab/KConnection.cxx +++ b/connectivity/source/drivers/kab/KConnection.cxx @@ -71,7 +71,7 @@ void KabConnection::construct() } // XServiceInfo -Reference< XStatement > SAL_CALL KabConnection::createStatement( ) throw(SQLException, RuntimeException, std::exception) +Reference< XStatement > SAL_CALL KabConnection::createStatement( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -83,7 +83,7 @@ Reference< XStatement > SAL_CALL KabConnection::createStatement( ) throw(SQLExc return xReturn; } -Reference< XPreparedStatement > SAL_CALL KabConnection::prepareStatement( const OUString& _sSql ) throw(SQLException, RuntimeException, std::exception) +Reference< XPreparedStatement > SAL_CALL KabConnection::prepareStatement( const OUString& _sSql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -95,7 +95,7 @@ Reference< XPreparedStatement > SAL_CALL KabConnection::prepareStatement( const return xReturn; } -Reference< XPreparedStatement > SAL_CALL KabConnection::prepareCall( const OUString& ) throw(SQLException, RuntimeException, std::exception) +Reference< XPreparedStatement > SAL_CALL KabConnection::prepareCall( const OUString& ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -104,7 +104,7 @@ Reference< XPreparedStatement > SAL_CALL KabConnection::prepareCall( const OUStr return nullptr; } -OUString SAL_CALL KabConnection::nativeSQL( const OUString& _sSql ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabConnection::nativeSQL( const OUString& _sSql ) { ::osl::MutexGuard aGuard( m_aMutex ); // when you need to transform SQL92 to you driver specific you can do it here @@ -112,14 +112,14 @@ OUString SAL_CALL KabConnection::nativeSQL( const OUString& _sSql ) throw(SQLExc return _sSql; } -void SAL_CALL KabConnection::setAutoCommit( sal_Bool ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabConnection::setAutoCommit( sal_Bool ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); // here you have to set your commit mode please have a look at the jdbc documentation to get a clear explanation } -sal_Bool SAL_CALL KabConnection::getAutoCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabConnection::getAutoCommit( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -129,7 +129,7 @@ sal_Bool SAL_CALL KabConnection::getAutoCommit( ) throw(SQLException, RuntimeEx return true; } -void SAL_CALL KabConnection::commit( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabConnection::commit( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -137,7 +137,7 @@ void SAL_CALL KabConnection::commit( ) throw(SQLException, RuntimeException, st // when you database does support transactions you should commit here } -void SAL_CALL KabConnection::rollback( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabConnection::rollback( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -145,7 +145,7 @@ void SAL_CALL KabConnection::rollback( ) throw(SQLException, RuntimeException, // same as commit but for the other case } -sal_Bool SAL_CALL KabConnection::isClosed( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabConnection::isClosed( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -153,7 +153,7 @@ sal_Bool SAL_CALL KabConnection::isClosed( ) throw(SQLException, RuntimeExcepti return KabConnection_BASE::rBHelper.bDisposed; } -Reference< XDatabaseMetaData > SAL_CALL KabConnection::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XDatabaseMetaData > SAL_CALL KabConnection::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -170,7 +170,7 @@ Reference< XDatabaseMetaData > SAL_CALL KabConnection::getMetaData( ) throw(SQL return xMetaData; } -void SAL_CALL KabConnection::setReadOnly( sal_Bool ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabConnection::setReadOnly( sal_Bool ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -178,7 +178,7 @@ void SAL_CALL KabConnection::setReadOnly( sal_Bool ) throw(SQLException, Runtime // set you connection to readonly } -sal_Bool SAL_CALL KabConnection::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabConnection::isReadOnly( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -187,7 +187,7 @@ sal_Bool SAL_CALL KabConnection::isReadOnly( ) throw(SQLException, RuntimeExcep return false; } -void SAL_CALL KabConnection::setCatalog( const OUString& ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabConnection::setCatalog( const OUString& ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -195,7 +195,7 @@ void SAL_CALL KabConnection::setCatalog( const OUString& ) throw(SQLException, R // if your database doesn't work with catalogs you go to next method otherwise you know what to do } -OUString SAL_CALL KabConnection::getCatalog( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabConnection::getCatalog( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -205,7 +205,7 @@ OUString SAL_CALL KabConnection::getCatalog( ) throw(SQLException, RuntimeExcep return OUString(); } -void SAL_CALL KabConnection::setTransactionIsolation( sal_Int32 ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabConnection::setTransactionIsolation( sal_Int32 ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -214,7 +214,7 @@ void SAL_CALL KabConnection::setTransactionIsolation( sal_Int32 ) throw(SQLExcep // please have a look at @see com.sun.star.sdbc.TransactionIsolation } -sal_Int32 SAL_CALL KabConnection::getTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabConnection::getTransactionIsolation( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -224,7 +224,7 @@ sal_Int32 SAL_CALL KabConnection::getTransactionIsolation( ) throw(SQLException return TransactionIsolation::NONE; } -Reference< css::container::XNameAccess > SAL_CALL KabConnection::getTypeMap( ) throw(SQLException, RuntimeException, std::exception) +Reference< css::container::XNameAccess > SAL_CALL KabConnection::getTypeMap( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabConnection_BASE::rBHelper.bDisposed); @@ -234,13 +234,13 @@ Reference< css::container::XNameAccess > SAL_CALL KabConnection::getTypeMap( ) return nullptr; } -void SAL_CALL KabConnection::setTypeMap( const Reference< css::container::XNameAccess >& ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabConnection::setTypeMap( const Reference< css::container::XNameAccess >& ) { // the other way around } // XCloseable -void SAL_CALL KabConnection::close( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabConnection::close( ) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -250,13 +250,13 @@ void SAL_CALL KabConnection::close( ) throw(SQLException, RuntimeException, std } // XWarningsSupplier -Any SAL_CALL KabConnection::getWarnings( ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL KabConnection::getWarnings( ) { // when you collected some warnings -> return it return Any(); } -void SAL_CALL KabConnection::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabConnection::clearWarnings( ) { // you should clear your collected warnings here } diff --git a/connectivity/source/drivers/kab/KConnection.hxx b/connectivity/source/drivers/kab/KConnection.hxx index 1c6781ae070a..0958cc1d39cb 100644 --- a/connectivity/source/drivers/kab/KConnection.hxx +++ b/connectivity/source/drivers/kab/KConnection.hxx @@ -83,7 +83,7 @@ namespace connectivity css::uno::Reference const & driver); virtual ~KabConnection() override; - void closeAllStatements () throw( css::sdbc::SQLException); + void closeAllStatements (); // OComponentHelper virtual void SAL_CALL disposing() override; @@ -95,31 +95,31 @@ namespace connectivity DECLARE_SERVICE_INFO(); // XConnection - virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getAutoCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL commit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL rollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isClosed( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCatalog( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) override; + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) override; + virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) override; + virtual sal_Bool SAL_CALL getAutoCommit( ) override; + virtual void SAL_CALL commit( ) override; + virtual void SAL_CALL rollback( ) override; + virtual sal_Bool SAL_CALL isClosed( ) override; + virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) override; + virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) override; + virtual sal_Bool SAL_CALL isReadOnly( ) override; + virtual void SAL_CALL setCatalog( const OUString& catalog ) override; + virtual OUString SAL_CALL getCatalog( ) override; + virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) override; + virtual sal_Int32 SAL_CALL getTransactionIsolation( ) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) override; + virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; // XCloseable - virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) override; // XWarningsSupplier - virtual css::uno::Any SAL_CALL getWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getWarnings( ) override; + virtual void SAL_CALL clearWarnings( ) override; // needed for the SQL interpreter css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL createCatalog(); diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx index 644f97bc97b9..70bfea861bb4 100644 --- a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx +++ b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx @@ -55,7 +55,7 @@ const OUString & KabDatabaseMetaData::getAddressBookTableName() return aAddressBookTableName; } -OUString SAL_CALL KabDatabaseMetaData::getCatalogSeparator( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabDatabaseMetaData::getCatalogSeparator( ) { OUString aVal; if (m_bUseCatalog) @@ -65,73 +65,73 @@ OUString SAL_CALL KabDatabaseMetaData::getCatalogSeparator( ) throw(SQLExceptio return aVal; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxBinaryLiteralLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxRowSize( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxRowSize( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxCatalogNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxCatalogNameLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxCharLiteralLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnNameLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInIndex( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxCursorNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxCursorNameLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxConnections( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxConnections( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInTable( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxStatementLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxStatementLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxTableNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxTableNameLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxTablesInSelect( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxTablesInSelect( ) { // MaxTablesInSelect describes how many tables can participate in the FROM part of a given SELECT statement, // currently, the resultset/statement implementations can cope with one table only @@ -139,63 +139,63 @@ sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxTablesInSelect( ) throw(SQLExcept return nValue; } -sal_Bool SAL_CALL KabDatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::storesLowerCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::storesLowerCaseIdentifiers( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::storesMixedCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::storesMixedCaseQuotedIdentifiers( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::storesMixedCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::storesMixedCaseIdentifiers( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::storesUpperCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::storesUpperCaseIdentifiers( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsAlterTableWithAddColumn( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsAlterTableWithAddColumn( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsAlterTableWithDropColumn( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsAlterTableWithDropColumn( ) { return false; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxIndexLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsNonNullableColumns( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsNonNullableColumns( ) { return false; } -OUString SAL_CALL KabDatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabDatabaseMetaData::getCatalogTerm( ) { OUString aVal; if (m_bUseCatalog) @@ -204,25 +204,25 @@ OUString SAL_CALL KabDatabaseMetaData::getCatalogTerm( ) throw(SQLException, Ru return aVal; } -OUString SAL_CALL KabDatabaseMetaData::getIdentifierQuoteString( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabDatabaseMetaData::getIdentifierQuoteString( ) { // normally this is " OUString aVal("\""); return aVal; } -OUString SAL_CALL KabDatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabDatabaseMetaData::getExtraNameCharacters( ) { OUString aVal; return aVal; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsDifferentTableCorrelationNames( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsDifferentTableCorrelationNames( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::isCatalogAtStart( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::isCatalogAtStart( ) { bool bValue = false; if (m_bUseCatalog) @@ -231,326 +231,326 @@ sal_Bool SAL_CALL KabDatabaseMetaData::isCatalogAtStart( ) throw(SQLException, return bValue; } -sal_Bool SAL_CALL KabDatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::dataDefinitionIgnoredInTransactions( ) { return true; } -sal_Bool SAL_CALL KabDatabaseMetaData::dataDefinitionCausesTransactionCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::dataDefinitionCausesTransactionCommit( ) { return true; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsDataManipulationTransactionsOnly( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsDataManipulationTransactionsOnly( ) { return true; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) { return true; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsPositionedDelete( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsPositionedDelete( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsPositionedUpdate( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsPositionedUpdate( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsOpenStatementsAcrossRollback( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsOpenStatementsAcrossRollback( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsOpenStatementsAcrossCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsOpenStatementsAcrossCommit( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsOpenCursorsAcrossCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsOpenCursorsAcrossCommit( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsOpenCursorsAcrossRollback( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsOpenCursorsAcrossRollback( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInDataManipulation( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInDataManipulation( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsANSI92FullSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsANSI92FullSQL( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsANSI92EntryLevelSQL( ) { return true; // should be supported at least } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsIntegrityEnhancementFacility( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInIndexDefinitions( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInTableDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInTableDefinitions( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInTableDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInTableDefinitions( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInIndexDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInIndexDefinitions( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInDataManipulation( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInDataManipulation( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsOuterJoins( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsOuterJoins( ) { return false; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxStatements( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxStatements( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxProcedureNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxProcedureNameLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxSchemaNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxSchemaNameLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsTransactions( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::allProceduresAreCallable( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::allProceduresAreCallable( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsStoredProcedures( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsStoredProcedures( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsSelectForUpdate( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsSelectForUpdate( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::allTablesAreSelectable( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::allTablesAreSelectable( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::isReadOnly( ) { // for the moment, we have read-only addresses, but this might change in the future return true; } -sal_Bool SAL_CALL KabDatabaseMetaData::usesLocalFiles( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::usesLocalFiles( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::usesLocalFilePerTable( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::usesLocalFilePerTable( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsTypeConversion( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsTypeConversion( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::nullPlusNonNullIsNull( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::nullPlusNonNullIsNull( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsColumnAliasing( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsColumnAliasing( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsTableCorrelationNames( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsTableCorrelationNames( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsConvert( sal_Int32, sal_Int32 ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsConvert( sal_Int32, sal_Int32 ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsExpressionsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsExpressionsInOrderBy( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsGroupBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsGroupBy( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsGroupByBeyondSelect( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsGroupByBeyondSelect( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsGroupByUnrelated( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsGroupByUnrelated( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsMultipleTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsMultipleTransactions( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsMultipleResultSets( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsMultipleResultSets( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsLikeEscapeClause( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsOrderByUnrelated( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsUnion( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsUnion( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsUnionAll( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsUnionAll( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsMixedCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsMixedCaseIdentifiers( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsMixedCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsMixedCaseQuotedIdentifiers( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::nullsAreSortedAtEnd( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::nullsAreSortedAtStart( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::nullsAreSortedAtStart( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::nullsAreSortedHigh( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::nullsAreSortedHigh( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::nullsAreSortedLow( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::nullsAreSortedLow( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInProcedureCalls( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInProcedureCalls( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInProcedureCalls( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsCorrelatedSubqueries( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsCorrelatedSubqueries( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsSubqueriesInComparisons( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsSubqueriesInComparisons( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsSubqueriesInExists( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsSubqueriesInExists( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsSubqueriesInIns( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsSubqueriesInIns( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsSubqueriesInQuantifieds( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsANSI92IntermediateSQL( ) { return false; } -OUString SAL_CALL KabDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabDatabaseMetaData::getURL( ) { // if someday we support more than the default address book, // this method should return the URL which was used to create it @@ -558,145 +558,145 @@ OUString SAL_CALL KabDatabaseMetaData::getURL( ) throw(SQLException, RuntimeExc return aValue; } -OUString SAL_CALL KabDatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabDatabaseMetaData::getUserName( ) { OUString aValue; return aValue; } -OUString SAL_CALL KabDatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabDatabaseMetaData::getDriverName( ) { OUString aValue( "kab" ); return aValue; } -OUString SAL_CALL KabDatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabDatabaseMetaData::getDriverVersion() { OUString aValue(KAB_DRIVER_VERSION); return aValue; } -OUString SAL_CALL KabDatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabDatabaseMetaData::getDatabaseProductVersion( ) { OUString aValue; return aValue; } -OUString SAL_CALL KabDatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabDatabaseMetaData::getDatabaseProductName( ) { OUString aValue; return aValue; } -OUString SAL_CALL KabDatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabDatabaseMetaData::getProcedureTerm( ) { OUString aValue; return aValue; } -OUString SAL_CALL KabDatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabDatabaseMetaData::getSchemaTerm( ) { OUString aValue; return aValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getDriverMajorVersion( ) { return KAB_DRIVER_VERSION_MAJOR; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getDefaultTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getDefaultTransactionIsolation( ) { return TransactionIsolation::NONE; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getDriverMinorVersion( ) { return KAB_DRIVER_VERSION_MINOR; } -OUString SAL_CALL KabDatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabDatabaseMetaData::getSQLKeywords( ) { OUString aValue; return aValue; } -OUString SAL_CALL KabDatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabDatabaseMetaData::getSearchStringEscape( ) { OUString aValue; return aValue; } -OUString SAL_CALL KabDatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabDatabaseMetaData::getStringFunctions( ) { return OUString(); } -OUString SAL_CALL KabDatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabDatabaseMetaData::getTimeDateFunctions( ) { return OUString(); } -OUString SAL_CALL KabDatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabDatabaseMetaData::getSystemFunctions( ) { return OUString(); } -OUString SAL_CALL KabDatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabDatabaseMetaData::getNumericFunctions( ) { return OUString(); } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsExtendedSQLGrammar( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsCoreSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsCoreSQLGrammar( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsMinimumSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsMinimumSQLGrammar( ) { return true; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsFullOuterJoins( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsFullOuterJoins( ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsLimitedOuterJoins( ) { return false; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInGroupBy( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInOrderBy( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxColumnsInSelect( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxUserNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDatabaseMetaData::getMaxUserNameLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsResultSetType( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsResultSetType( sal_Int32 setType ) { switch (setType) { @@ -707,7 +707,7 @@ sal_Bool SAL_CALL KabDatabaseMetaData::supportsResultSetType( sal_Int32 setType return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 ) { switch (setType) { @@ -718,62 +718,62 @@ sal_Bool SAL_CALL KabDatabaseMetaData::supportsResultSetConcurrency( sal_Int32 s return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::ownUpdatesAreVisible( sal_Int32 ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::ownUpdatesAreVisible( sal_Int32 ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::ownDeletesAreVisible( sal_Int32 ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::ownDeletesAreVisible( sal_Int32 ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::ownInsertsAreVisible( sal_Int32 ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::ownInsertsAreVisible( sal_Int32 ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::othersUpdatesAreVisible( sal_Int32 ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::othersUpdatesAreVisible( sal_Int32 ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::othersDeletesAreVisible( sal_Int32 ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::othersDeletesAreVisible( sal_Int32 ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::othersInsertsAreVisible( sal_Int32 ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::othersInsertsAreVisible( sal_Int32 ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::updatesAreDetected( sal_Int32 ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::updatesAreDetected( sal_Int32 ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::deletesAreDetected( sal_Int32 ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::deletesAreDetected( sal_Int32 ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::insertsAreDetected( sal_Int32 ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::insertsAreDetected( sal_Int32 ) { return false; } -sal_Bool SAL_CALL KabDatabaseMetaData::supportsBatchUpdates( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabDatabaseMetaData::supportsBatchUpdates( ) { return false; } -Reference< XConnection > SAL_CALL KabDatabaseMetaData::getConnection( ) throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > SAL_CALL KabDatabaseMetaData::getConnection( ) { return m_xConnection.get(); } -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTableTypes( ) { ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTableTypes); Reference< XResultSet > xRef = pResult; @@ -791,7 +791,7 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTableTypes( ) throw(SQ return xRef; } -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTypeInfo( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTypeInfo( ) { ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTypeInfo); Reference< XResultSet > xRef = pResult; @@ -828,19 +828,19 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTypeInfo( ) throw(SQLE return xRef; } -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getCatalogs( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getCatalogs( ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eCatalogs ); } -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getSchemas( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getSchemas( ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eSchemas ); } Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumnPrivileges( const Any&, const OUString&, const OUString&, - const OUString& ) throw(SQLException, RuntimeException, std::exception) + const OUString& ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eColumnPrivileges ); } @@ -849,7 +849,7 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumns( const Any&, const OUString&, const OUString& tableNamePattern, - const OUString& columnNamePattern) throw(SQLException, RuntimeException, std::exception) + const OUString& columnNamePattern) { ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eColumns); Reference< XResultSet > xRef = pResult; @@ -919,7 +919,7 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTables( const Any&, const OUString&, const OUString&, - const Sequence< OUString >& types) throw(SQLException, RuntimeException, std::exception) + const Sequence< OUString >& types) { ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTables); Reference< XResultSet > xRef = pResult; @@ -968,20 +968,20 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTables( Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getProcedureColumns( const Any&, const OUString&, - const OUString&, const OUString& ) throw(SQLException, RuntimeException, std::exception) + const OUString&, const OUString& ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedureColumns ); } Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getProcedures( const Any&, const OUString&, - const OUString& ) throw(SQLException, RuntimeException, std::exception) + const OUString& ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedures ); } Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getVersionColumns( - const Any&, const OUString&, const OUString& table ) throw(SQLException, RuntimeException, std::exception) + const Any&, const OUString&, const OUString& table ) { ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eVersionColumns); @@ -1014,39 +1014,39 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getVersionColumns( } Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getExportedKeys( - const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException, std::exception) + const Any&, const OUString&, const OUString& ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eExportedKeys ); } Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getImportedKeys( - const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException, std::exception) + const Any&, const OUString&, const OUString& ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eImportedKeys ); } Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getPrimaryKeys( - const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException, std::exception) + const Any&, const OUString&, const OUString& ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::ePrimaryKeys ); } Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getIndexInfo( const Any&, const OUString&, const OUString&, - sal_Bool, sal_Bool ) throw(SQLException, RuntimeException, std::exception) + sal_Bool, sal_Bool ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eIndexInfo ); } Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getBestRowIdentifier( const Any&, const OUString&, const OUString&, sal_Int32, - sal_Bool ) throw(SQLException, RuntimeException, std::exception) + sal_Bool ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eBestRowIdentifier ); } Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTablePrivileges( - const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException, std::exception) + const Any&, const OUString&, const OUString& ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eTablePrivileges ); } @@ -1054,12 +1054,12 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTablePrivileges( Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getCrossReference( const Any&, const OUString&, const OUString&, const Any&, - const OUString&, const OUString& ) throw(SQLException, RuntimeException, std::exception) + const OUString&, const OUString& ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eCrossReference ); } -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getUDTs( const Any&, const OUString&, const OUString&, const Sequence< sal_Int32 >& ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getUDTs( const Any&, const OUString&, const OUString&, const Sequence< sal_Int32 >& ) { OSL_FAIL("Not implemented yet!"); throw SQLException(); diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.hxx b/connectivity/source/drivers/kab/KDatabaseMetaData.hxx index 69976d1aa95e..ac896c87d582 100644 --- a/connectivity/source/drivers/kab/KDatabaseMetaData.hxx +++ b/connectivity/source/drivers/kab/KDatabaseMetaData.hxx @@ -48,155 +48,155 @@ namespace connectivity // this interface is really BIG // XDatabaseMetaData - virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getURL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getUserName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDatabaseProductName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDatabaseProductVersion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDriverName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDriverVersion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL usesLocalFiles( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getIdentifierQuoteString( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSQLKeywords( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getNumericFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getStringFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSystemFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTimeDateFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSearchStringEscape( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getExtraNameCharacters( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTypeConversion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsGroupBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSchemaTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getProcedureTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCatalogTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isCatalogAtStart( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCatalogSeparator( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInDataManipulation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInTableDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsPositionedDelete( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsStoredProcedures( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsUnion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsUnionAll( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxConnections( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxIndexLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxRowSize( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxStatementLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxStatements( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxTablesInSelect( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const css::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTypeInfo( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL allProceduresAreCallable( ) override; + virtual sal_Bool SAL_CALL allTablesAreSelectable( ) override; + virtual OUString SAL_CALL getURL( ) override; + virtual OUString SAL_CALL getUserName( ) override; + virtual sal_Bool SAL_CALL isReadOnly( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedLow( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) override; + virtual OUString SAL_CALL getDatabaseProductName( ) override; + virtual OUString SAL_CALL getDatabaseProductVersion( ) override; + virtual OUString SAL_CALL getDriverName( ) override; + virtual OUString SAL_CALL getDriverVersion( ) override; + virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) override; + virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) override; + virtual sal_Bool SAL_CALL usesLocalFiles( ) override; + virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) override; + virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers( ) override; + virtual OUString SAL_CALL getIdentifierQuoteString( ) override; + virtual OUString SAL_CALL getSQLKeywords( ) override; + virtual OUString SAL_CALL getNumericFunctions( ) override; + virtual OUString SAL_CALL getStringFunctions( ) override; + virtual OUString SAL_CALL getSystemFunctions( ) override; + virtual OUString SAL_CALL getTimeDateFunctions( ) override; + virtual OUString SAL_CALL getSearchStringEscape( ) override; + virtual OUString SAL_CALL getExtraNameCharacters( ) override; + virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn( ) override; + virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn( ) override; + virtual sal_Bool SAL_CALL supportsColumnAliasing( ) override; + virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) override; + virtual sal_Bool SAL_CALL supportsTypeConversion( ) override; + virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) override; + virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) override; + virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) override; + virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) override; + virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) override; + virtual sal_Bool SAL_CALL supportsGroupBy( ) override; + virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) override; + virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) override; + virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) override; + virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) override; + virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) override; + virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) override; + virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) override; + virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) override; + virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) override; + virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) override; + virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) override; + virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) override; + virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) override; + virtual sal_Bool SAL_CALL supportsOuterJoins( ) override; + virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) override; + virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) override; + virtual OUString SAL_CALL getSchemaTerm( ) override; + virtual OUString SAL_CALL getProcedureTerm( ) override; + virtual OUString SAL_CALL getCatalogTerm( ) override; + virtual sal_Bool SAL_CALL isCatalogAtStart( ) override; + virtual OUString SAL_CALL getCatalogSeparator( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInDataManipulation( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInTableDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsPositionedDelete( ) override; + virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) override; + virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) override; + virtual sal_Bool SAL_CALL supportsStoredProcedures( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) override; + virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) override; + virtual sal_Bool SAL_CALL supportsUnion( ) override; + virtual sal_Bool SAL_CALL supportsUnionAll( ) override; + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) override; + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) override; + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) override; + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) override; + virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) override; + virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) override; + virtual sal_Int32 SAL_CALL getMaxConnections( ) override; + virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxIndexLength( ) override; + virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxRowSize( ) override; + virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) override; + virtual sal_Int32 SAL_CALL getMaxStatementLength( ) override; + virtual sal_Int32 SAL_CALL getMaxStatements( ) override; + virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxTablesInSelect( ) override; + virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) override; + virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) override; + virtual sal_Bool SAL_CALL supportsTransactions( ) override; + virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) override; + virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) override; + virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) override; + virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) override; + virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const css::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTypeInfo( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) override; + virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) override; + virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL supportsBatchUpdates( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) override; }; } } diff --git a/connectivity/source/drivers/kab/KDriver.cxx b/connectivity/source/drivers/kab/KDriver.cxx index 52c849270be0..d169d66ff7b1 100644 --- a/connectivity/source/drivers/kab/KDriver.cxx +++ b/connectivity/source/drivers/kab/KDriver.cxx @@ -360,12 +360,12 @@ void KabDriver::disposing() } // static ServiceInfo -OUString KabDriver::getImplementationName_Static( ) throw(RuntimeException) +OUString KabDriver::getImplementationName_Static( ) { return OUString("com.sun.star.comp.sdbc." KAB_SERVICE_NAME ".Driver"); } -Sequence< OUString > KabDriver::getSupportedServiceNames_Static( ) throw (RuntimeException) +Sequence< OUString > KabDriver::getSupportedServiceNames_Static( ) { // which service is supported // for more information @see com.sun.star.sdbc.Driver @@ -374,22 +374,22 @@ Sequence< OUString > KabDriver::getSupportedServiceNames_Static( ) throw (Runti return aSNS; } -OUString SAL_CALL KabDriver::getImplementationName( ) throw(RuntimeException, std::exception) +OUString SAL_CALL KabDriver::getImplementationName( ) { return getImplementationName_Static(); } -sal_Bool SAL_CALL KabDriver::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL KabDriver::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } -Sequence< OUString > SAL_CALL KabDriver::getSupportedServiceNames( ) throw(RuntimeException, std::exception) +Sequence< OUString > SAL_CALL KabDriver::getSupportedServiceNames( ) { return getSupportedServiceNames_Static(); } -Reference< XConnection > SAL_CALL KabDriver::connect( const OUString&, const Sequence< PropertyValue >& ) throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > SAL_CALL KabDriver::connect( const OUString&, const Sequence< PropertyValue >& ) { ::osl::MutexGuard aGuard(m_aMutex); @@ -408,7 +408,6 @@ Reference< XConnection > SAL_CALL KabDriver::connect( const OUString&, const Seq } sal_Bool SAL_CALL KabDriver::acceptsURL( const OUString& url ) - throw(SQLException, RuntimeException, std::exception) { ::osl::MutexGuard aGuard(m_aMutex); @@ -419,33 +418,33 @@ sal_Bool SAL_CALL KabDriver::acceptsURL( const OUString& url ) return url.startsWith("sdbc:address:" KAB_SERVICE_NAME); } -Sequence< DriverPropertyInfo > SAL_CALL KabDriver::getPropertyInfo( const OUString&, const Sequence< PropertyValue >& ) throw(SQLException, RuntimeException, std::exception) +Sequence< DriverPropertyInfo > SAL_CALL KabDriver::getPropertyInfo( const OUString&, const Sequence< PropertyValue >& ) { // if you have something special to say, return it here :-) return Sequence< DriverPropertyInfo >(); } -sal_Int32 SAL_CALL KabDriver::getMajorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDriver::getMajorVersion( ) { return KAB_DRIVER_VERSION_MAJOR; } -sal_Int32 SAL_CALL KabDriver::getMinorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL KabDriver::getMinorVersion( ) { return KAB_DRIVER_VERSION_MINOR; } -void SAL_CALL KabDriver::queryTermination( const EventObject& ) throw (TerminationVetoException, RuntimeException, std::exception) +void SAL_CALL KabDriver::queryTermination( const EventObject& ) { // nothing to do, nothing to veto } -void SAL_CALL KabDriver::notifyTermination( const EventObject& ) throw (RuntimeException, std::exception) +void SAL_CALL KabDriver::notifyTermination( const EventObject& ) { m_aImplModule.shutdown(); } -void SAL_CALL KabDriver::disposing( const EventObject& ) throw (RuntimeException, std::exception) +void SAL_CALL KabDriver::disposing( const EventObject& ) { // not interested in (this is the disposing of the desktop, if any) } @@ -458,7 +457,7 @@ OUString KabDriver::impl_getConfigurationSettingsPath() return aPath.makeStringAndClear(); } -Reference< XInterface > SAL_CALL KabDriver::Create( const Reference< XMultiServiceFactory >& _rxFactory ) throw( Exception ) +Reference< XInterface > SAL_CALL KabDriver::Create( const Reference< XMultiServiceFactory >& _rxFactory ) { return *(new KabDriver( comphelper::getComponentContext(_rxFactory))); } diff --git a/connectivity/source/drivers/kab/KDriver.hxx b/connectivity/source/drivers/kab/KDriver.hxx index b061b0040668..8a94db9ed180 100644 --- a/connectivity/source/drivers/kab/KDriver.hxx +++ b/connectivity/source/drivers/kab/KDriver.hxx @@ -144,11 +144,11 @@ namespace connectivity KabImplModule m_aImplModule; public: - static css::uno::Reference< css::uno::XInterface > SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception ); + static css::uno::Reference< css::uno::XInterface > SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory); // XServiceInfo - static versions - static OUString getImplementationName_Static( ) throw(css::uno::RuntimeException); - static css::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (css::uno::RuntimeException); + static OUString getImplementationName_Static( ); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static( ); /** returns the path of our configuration settings */ @@ -161,23 +161,23 @@ namespace connectivity virtual void SAL_CALL disposing() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XDriver - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMajorVersion() throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMinorVersion() throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override; + virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) override; + virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override; + virtual sal_Int32 SAL_CALL getMajorVersion() override; + virtual sal_Int32 SAL_CALL getMinorVersion() override; // XTerminateListener - virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) throw (css::frame::TerminationVetoException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) override; + virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; private: /** shuts down the library which contains the real implementations diff --git a/connectivity/source/drivers/kab/KPreparedStatement.cxx b/connectivity/source/drivers/kab/KPreparedStatement.cxx index b10cb8261356..5cf649696e4d 100644 --- a/connectivity/source/drivers/kab/KPreparedStatement.cxx +++ b/connectivity/source/drivers/kab/KPreparedStatement.cxx @@ -33,7 +33,7 @@ using namespace com::sun::star::util; IMPLEMENT_SERVICE_INFO(KabPreparedStatement, "com.sun.star.sdbc.drivers.KabPreparedStatement", "com.sun.star.sdbc.PreparedStatement"); -void KabPreparedStatement::checkAndResizeParameters(sal_Int32 nParams) throw(SQLException) +void KabPreparedStatement::checkAndResizeParameters(sal_Int32 nParams) { if ( !m_aParameterRow.is() ) m_aParameterRow = new OValueVector(); @@ -45,7 +45,7 @@ void KabPreparedStatement::checkAndResizeParameters(sal_Int32 nParams) throw(SQL (m_aParameterRow->get()).resize(nParams); } -void KabPreparedStatement::setKabFields() const throw(SQLException) +void KabPreparedStatement::setKabFields() const { ::rtl::Reference xColumns; // selected columns @@ -61,12 +61,12 @@ void KabPreparedStatement::setKabFields() const throw(SQLException) m_xMetaData->setKabFields(xColumns); } -void KabPreparedStatement::resetParameters() const throw(SQLException) +void KabPreparedStatement::resetParameters() const { m_nParameterIndex = 0; } -void KabPreparedStatement::getNextParameter(OUString &rParameter) const throw(SQLException) +void KabPreparedStatement::getNextParameter(OUString &rParameter) const { if (m_nParameterIndex >= (sal_Int32) (m_aParameterRow->get()).size()) { @@ -108,7 +108,7 @@ void KabPreparedStatement::disposing() } } -Reference< XResultSetMetaData > SAL_CALL KabPreparedStatement::getMetaData() throw(SQLException, RuntimeException, std::exception) +Reference< XResultSetMetaData > SAL_CALL KabPreparedStatement::getMetaData() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); @@ -122,7 +122,7 @@ Reference< XResultSetMetaData > SAL_CALL KabPreparedStatement::getMetaData() thr return xMetaData; } -void SAL_CALL KabPreparedStatement::close() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::close() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); @@ -140,7 +140,7 @@ void SAL_CALL KabPreparedStatement::close() throw(SQLException, RuntimeException // list } -sal_Bool SAL_CALL KabPreparedStatement::execute() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabPreparedStatement::execute() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); @@ -150,7 +150,7 @@ sal_Bool SAL_CALL KabPreparedStatement::execute() throw(SQLException, RuntimeExc return xRS.is(); } -sal_Int32 SAL_CALL KabPreparedStatement::executeUpdate() throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabPreparedStatement::executeUpdate() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); @@ -159,7 +159,7 @@ sal_Int32 SAL_CALL KabPreparedStatement::executeUpdate() throw(SQLException, Run return 0; } -Reference< XConnection > SAL_CALL KabPreparedStatement::getConnection() throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > SAL_CALL KabPreparedStatement::getConnection() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); @@ -167,7 +167,7 @@ Reference< XConnection > SAL_CALL KabPreparedStatement::getConnection() throw(SQ return m_pConnection; } -Reference< XResultSet > SAL_CALL KabPreparedStatement::executeQuery() throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL KabPreparedStatement::executeQuery() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); @@ -177,7 +177,7 @@ Reference< XResultSet > SAL_CALL KabPreparedStatement::executeQuery() throw(SQLE return rs; } -void SAL_CALL KabPreparedStatement::setNull(sal_Int32 parameterIndex, sal_Int32) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setNull(sal_Int32 parameterIndex, sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); @@ -187,47 +187,47 @@ void SAL_CALL KabPreparedStatement::setNull(sal_Int32 parameterIndex, sal_Int32) (m_aParameterRow->get())[parameterIndex - 1].setNull(); } -void SAL_CALL KabPreparedStatement::setObjectNull(sal_Int32, sal_Int32, const OUString&) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setObjectNull(sal_Int32, sal_Int32, const OUString&) { ::dbtools::throwFunctionNotSupportedSQLException("setObjectNull", nullptr); } -void SAL_CALL KabPreparedStatement::setBoolean(sal_Int32, sal_Bool) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setBoolean(sal_Int32, sal_Bool) { ::dbtools::throwFunctionNotSupportedSQLException("setBoolean", nullptr); } -void SAL_CALL KabPreparedStatement::setByte(sal_Int32, sal_Int8) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setByte(sal_Int32, sal_Int8) { ::dbtools::throwFunctionNotSupportedSQLException("setByte", nullptr); } -void SAL_CALL KabPreparedStatement::setShort(sal_Int32, sal_Int16) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setShort(sal_Int32, sal_Int16) { ::dbtools::throwFunctionNotSupportedSQLException("setShort", nullptr); } -void SAL_CALL KabPreparedStatement::setInt(sal_Int32, sal_Int32) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setInt(sal_Int32, sal_Int32) { ::dbtools::throwFunctionNotSupportedSQLException("setInt", nullptr); } -void SAL_CALL KabPreparedStatement::setLong(sal_Int32, sal_Int64) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setLong(sal_Int32, sal_Int64) { ::dbtools::throwFunctionNotSupportedSQLException("", nullptr); } -void SAL_CALL KabPreparedStatement::setFloat(sal_Int32, float) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setFloat(sal_Int32, float) { ::dbtools::throwFunctionNotSupportedSQLException("setFloat", nullptr); } -void SAL_CALL KabPreparedStatement::setDouble(sal_Int32, double) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setDouble(sal_Int32, double) { ::dbtools::throwFunctionNotSupportedSQLException("setDouble", nullptr); } -void SAL_CALL KabPreparedStatement::setString(sal_Int32 parameterIndex, const OUString &x) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setString(sal_Int32 parameterIndex, const OUString &x) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); @@ -237,38 +237,38 @@ void SAL_CALL KabPreparedStatement::setString(sal_Int32 parameterIndex, const OU (m_aParameterRow->get())[parameterIndex - 1] = x; } -void SAL_CALL KabPreparedStatement::setBytes(sal_Int32, const Sequence< sal_Int8 >&) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setBytes(sal_Int32, const Sequence< sal_Int8 >&) { ::dbtools::throwFunctionNotSupportedSQLException("setBytes", nullptr); } -void SAL_CALL KabPreparedStatement::setDate(sal_Int32, const Date&) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setDate(sal_Int32, const Date&) { ::dbtools::throwFunctionNotSupportedSQLException("setDate", nullptr); } -void SAL_CALL KabPreparedStatement::setTime(sal_Int32, const css::util::Time&) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setTime(sal_Int32, const css::util::Time&) { ::dbtools::throwFunctionNotSupportedSQLException("setTime", nullptr); } -void SAL_CALL KabPreparedStatement::setTimestamp(sal_Int32, const DateTime&) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setTimestamp(sal_Int32, const DateTime&) { ::dbtools::throwFunctionNotSupportedSQLException("setTimestamp", nullptr); } -void SAL_CALL KabPreparedStatement::setBinaryStream(sal_Int32, const Reference< css::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setBinaryStream(sal_Int32, const Reference< css::io::XInputStream >&, sal_Int32) { ::dbtools::throwFunctionNotSupportedSQLException("setBinaryStream", nullptr); } -void SAL_CALL KabPreparedStatement::setCharacterStream(sal_Int32, const Reference< css::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setCharacterStream(sal_Int32, const Reference< css::io::XInputStream >&, sal_Int32) { ::dbtools::throwFunctionNotSupportedSQLException("setCharacterStream", nullptr); } -void SAL_CALL KabPreparedStatement::setObject(sal_Int32 parameterIndex, const Any& x) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setObject(sal_Int32 parameterIndex, const Any& x) { if(!::dbtools::implSetObject(this,parameterIndex,x)) { @@ -276,37 +276,37 @@ void SAL_CALL KabPreparedStatement::setObject(sal_Int32 parameterIndex, const An } } -void SAL_CALL KabPreparedStatement::setObjectWithInfo(sal_Int32, const Any&, sal_Int32, sal_Int32) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setObjectWithInfo(sal_Int32, const Any&, sal_Int32, sal_Int32) { ::dbtools::throwFunctionNotSupportedSQLException("setObjectWithInfo", nullptr); } -void SAL_CALL KabPreparedStatement::setRef(sal_Int32, const Reference< XRef >&) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setRef(sal_Int32, const Reference< XRef >&) { ::dbtools::throwFunctionNotSupportedSQLException("setRef", nullptr); } -void SAL_CALL KabPreparedStatement::setBlob(sal_Int32, const Reference< XBlob >&) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setBlob(sal_Int32, const Reference< XBlob >&) { ::dbtools::throwFunctionNotSupportedSQLException("setBlob", nullptr); } -void SAL_CALL KabPreparedStatement::setClob(sal_Int32, const Reference< XClob >&) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setClob(sal_Int32, const Reference< XClob >&) { ::dbtools::throwFunctionNotSupportedSQLException("setClob", nullptr); } -void SAL_CALL KabPreparedStatement::setArray(sal_Int32, const Reference< XArray >&) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::setArray(sal_Int32, const Reference< XArray >&) { ::dbtools::throwFunctionNotSupportedSQLException("setArray", nullptr); } -void SAL_CALL KabPreparedStatement::clearParameters() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabPreparedStatement::clearParameters() { ::dbtools::throwFunctionNotSupportedSQLException("clearParameters", nullptr); } -void KabPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception, std::exception) +void KabPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) { switch (nHandle) { diff --git a/connectivity/source/drivers/kab/KPreparedStatement.hxx b/connectivity/source/drivers/kab/KPreparedStatement.hxx index 2b4f801232df..28b22d8e77a3 100644 --- a/connectivity/source/drivers/kab/KPreparedStatement.hxx +++ b/connectivity/source/drivers/kab/KPreparedStatement.hxx @@ -47,16 +47,16 @@ namespace connectivity mutable sal_Int32 m_nParameterIndex; OValueRow m_aParameterRow; - void checkAndResizeParameters(sal_Int32 nParams) throw(css::sdbc::SQLException); - void setKabFields() const throw(css::sdbc::SQLException); + void checkAndResizeParameters(sal_Int32 nParams); + void setKabFields() const; protected: virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const css::uno::Any& rValue) throw (css::uno::Exception, std::exception) override; + const css::uno::Any& rValue) override; - virtual void resetParameters() const throw(css::sdbc::SQLException) override; - virtual void getNextParameter(OUString &rParameter) const throw(css::sdbc::SQLException) override; + virtual void resetParameters() const override; + virtual void getNextParameter(OUString &rParameter) const override; virtual ~KabPreparedStatement() override; public: @@ -67,44 +67,44 @@ namespace connectivity virtual void SAL_CALL disposing() override; // XPreparedStatement - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL executeUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL execute( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( ) override; + virtual sal_Int32 SAL_CALL executeUpdate( ) override; + virtual sal_Bool SAL_CALL execute( ) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) override; using KabCommonStatement::executeQuery; using KabCommonStatement::executeUpdate; using KabCommonStatement::execute; // XParameters - virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearParameters( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) override; + virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) override; + virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) override; + virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) override; + virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) override; + virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) override; + virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) override; + virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) override; + virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) override; + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) override; + virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) override; + virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) override; + virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) override; + virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) override; + virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) override; + virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) override; + virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) override; + virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) override; + virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) override; + virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) override; + virtual void SAL_CALL clearParameters( ) override; // XCloseable - virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) override; // XResultSetMetaDataSupplier - virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) override; }; } } diff --git a/connectivity/source/drivers/kab/KResultSet.cxx b/connectivity/source/drivers/kab/KResultSet.cxx index 8babcb4714e3..5527b998923c 100644 --- a/connectivity/source/drivers/kab/KResultSet.cxx +++ b/connectivity/source/drivers/kab/KResultSet.cxx @@ -116,7 +116,7 @@ m_xStatement.clear(); m_xMetaData.clear(); } -Any SAL_CALL KabResultSet::queryInterface(const Type & rType) throw(RuntimeException, std::exception) +Any SAL_CALL KabResultSet::queryInterface(const Type & rType) { Any aRet = OPropertySetHelper::queryInterface(rType); if (!aRet.hasValue()) @@ -134,7 +134,7 @@ void SAL_CALL KabResultSet::release() throw() KabResultSet_BASE::release(); } -Sequence< Type > SAL_CALL KabResultSet::getTypes() throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL KabResultSet::getTypes() { OTypeCollection aTypes( cppu::UnoType::get(), @@ -144,12 +144,12 @@ Sequence< Type > SAL_CALL KabResultSet::getTypes() throw(RuntimeException, std: return comphelper::concatSequences(aTypes.getTypes(), KabResultSet_BASE::getTypes()); } -css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL KabResultSet::getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL KabResultSet::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } -sal_Int32 SAL_CALL KabResultSet::findColumn(const OUString& columnName) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabResultSet::findColumn(const OUString& columnName) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -169,7 +169,7 @@ sal_Int32 SAL_CALL KabResultSet::findColumn(const OUString& columnName) throw(SQ return 0; // Never reached } -OUString SAL_CALL KabResultSet::getString(sal_Int32 columnIndex) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL KabResultSet::getString(sal_Int32 columnIndex) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -206,7 +206,7 @@ return aRet; return aRet; } -sal_Bool SAL_CALL KabResultSet::getBoolean(sal_Int32) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSet::getBoolean(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -216,7 +216,7 @@ sal_Bool SAL_CALL KabResultSet::getBoolean(sal_Int32) throw(SQLException, Runtim return false; } -sal_Int8 SAL_CALL KabResultSet::getByte(sal_Int32) throw(SQLException, RuntimeException, std::exception) +sal_Int8 SAL_CALL KabResultSet::getByte(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -227,7 +227,7 @@ sal_Int8 SAL_CALL KabResultSet::getByte(sal_Int32) throw(SQLException, RuntimeEx return nRet; } -sal_Int16 SAL_CALL KabResultSet::getShort(sal_Int32) throw(SQLException, RuntimeException, std::exception) +sal_Int16 SAL_CALL KabResultSet::getShort(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -238,7 +238,7 @@ sal_Int16 SAL_CALL KabResultSet::getShort(sal_Int32) throw(SQLException, Runtime return nRet; } -sal_Int32 SAL_CALL KabResultSet::getInt(sal_Int32) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabResultSet::getInt(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -249,7 +249,7 @@ sal_Int32 SAL_CALL KabResultSet::getInt(sal_Int32) throw(SQLException, RuntimeEx return nRet; } -sal_Int64 SAL_CALL KabResultSet::getLong(sal_Int32) throw(SQLException, RuntimeException, std::exception) +sal_Int64 SAL_CALL KabResultSet::getLong(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -259,7 +259,7 @@ sal_Int64 SAL_CALL KabResultSet::getLong(sal_Int32) throw(SQLException, RuntimeE return sal_Int64(); } -float SAL_CALL KabResultSet::getFloat(sal_Int32) throw(SQLException, RuntimeException, std::exception) +float SAL_CALL KabResultSet::getFloat(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -270,7 +270,7 @@ float SAL_CALL KabResultSet::getFloat(sal_Int32) throw(SQLException, RuntimeExce return nVal; } -double SAL_CALL KabResultSet::getDouble(sal_Int32) throw(SQLException, RuntimeException, std::exception) +double SAL_CALL KabResultSet::getDouble(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -281,7 +281,7 @@ double SAL_CALL KabResultSet::getDouble(sal_Int32) throw(SQLException, RuntimeEx return nRet; } -Sequence< sal_Int8 > SAL_CALL KabResultSet::getBytes(sal_Int32) throw(SQLException, RuntimeException, std::exception) +Sequence< sal_Int8 > SAL_CALL KabResultSet::getBytes(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -291,7 +291,7 @@ Sequence< sal_Int8 > SAL_CALL KabResultSet::getBytes(sal_Int32) throw(SQLExcepti return Sequence< sal_Int8 >(); } -cssu::Date SAL_CALL KabResultSet::getDate(sal_Int32) throw(SQLException, RuntimeException, std::exception) +cssu::Date SAL_CALL KabResultSet::getDate(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -302,7 +302,7 @@ cssu::Date SAL_CALL KabResultSet::getDate(sal_Int32) throw(SQLException, Runtime return aRet; } -cssu::Time SAL_CALL KabResultSet::getTime(sal_Int32) throw(SQLException, RuntimeException, std::exception) +cssu::Time SAL_CALL KabResultSet::getTime(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -313,7 +313,7 @@ cssu::Time SAL_CALL KabResultSet::getTime(sal_Int32) throw(SQLException, Runtime return nRet; } -cssu::DateTime SAL_CALL KabResultSet::getTimestamp(sal_Int32 columnIndex) throw(SQLException, RuntimeException, std::exception) +cssu::DateTime SAL_CALL KabResultSet::getTimestamp(sal_Int32 columnIndex) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -352,7 +352,7 @@ cssu::DateTime SAL_CALL KabResultSet::getTimestamp(sal_Int32 columnIndex) throw( return nRet; } -Reference< XInputStream > SAL_CALL KabResultSet::getBinaryStream(sal_Int32) throw(SQLException, RuntimeException, std::exception) +Reference< XInputStream > SAL_CALL KabResultSet::getBinaryStream(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -362,7 +362,7 @@ Reference< XInputStream > SAL_CALL KabResultSet::getBinaryStream(sal_Int32) thro return nullptr; } -Reference< XInputStream > SAL_CALL KabResultSet::getCharacterStream(sal_Int32) throw(SQLException, RuntimeException, std::exception) +Reference< XInputStream > SAL_CALL KabResultSet::getCharacterStream(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -372,7 +372,7 @@ Reference< XInputStream > SAL_CALL KabResultSet::getCharacterStream(sal_Int32) t return nullptr; } -Any SAL_CALL KabResultSet::getObject(sal_Int32, const Reference< css::container::XNameAccess >&) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL KabResultSet::getObject(sal_Int32, const Reference< css::container::XNameAccess >&) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -382,7 +382,7 @@ Any SAL_CALL KabResultSet::getObject(sal_Int32, const Reference< css::container: return Any(); } -Reference< XRef > SAL_CALL KabResultSet::getRef(sal_Int32) throw(SQLException, RuntimeException, std::exception) +Reference< XRef > SAL_CALL KabResultSet::getRef(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -392,7 +392,7 @@ Reference< XRef > SAL_CALL KabResultSet::getRef(sal_Int32) throw(SQLException, R return nullptr; } -Reference< XBlob > SAL_CALL KabResultSet::getBlob(sal_Int32) throw(SQLException, RuntimeException, std::exception) +Reference< XBlob > SAL_CALL KabResultSet::getBlob(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -402,7 +402,7 @@ Reference< XBlob > SAL_CALL KabResultSet::getBlob(sal_Int32) throw(SQLException, return nullptr; } -Reference< XClob > SAL_CALL KabResultSet::getClob(sal_Int32) throw(SQLException, RuntimeException, std::exception) +Reference< XClob > SAL_CALL KabResultSet::getClob(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -412,7 +412,7 @@ Reference< XClob > SAL_CALL KabResultSet::getClob(sal_Int32) throw(SQLException, return nullptr; } -Reference< XArray > SAL_CALL KabResultSet::getArray(sal_Int32) throw(SQLException, RuntimeException, std::exception) +Reference< XArray > SAL_CALL KabResultSet::getArray(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -422,7 +422,7 @@ Reference< XArray > SAL_CALL KabResultSet::getArray(sal_Int32) throw(SQLExceptio return nullptr; } -Reference< XResultSetMetaData > SAL_CALL KabResultSet::getMetaData() throw(SQLException, RuntimeException, std::exception) +Reference< XResultSetMetaData > SAL_CALL KabResultSet::getMetaData() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -434,7 +434,7 @@ Reference< XResultSetMetaData > SAL_CALL KabResultSet::getMetaData() throw(SQLEx return xMetaData; } -sal_Bool SAL_CALL KabResultSet::isBeforeFirst() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSet::isBeforeFirst() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -445,7 +445,7 @@ sal_Bool SAL_CALL KabResultSet::isBeforeFirst() throw(SQLException, RuntimeExcep return false; } -sal_Bool SAL_CALL KabResultSet::isAfterLast() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSet::isAfterLast() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -457,7 +457,7 @@ sal_Bool SAL_CALL KabResultSet::isAfterLast() throw(SQLException, RuntimeExcepti return false; } -sal_Bool SAL_CALL KabResultSet::isFirst() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSet::isFirst() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -468,7 +468,7 @@ sal_Bool SAL_CALL KabResultSet::isFirst() throw(SQLException, RuntimeException, return false; } -sal_Bool SAL_CALL KabResultSet::isLast() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSet::isLast() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -480,7 +480,7 @@ sal_Bool SAL_CALL KabResultSet::isLast() throw(SQLException, RuntimeException, s return false; } -void SAL_CALL KabResultSet::beforeFirst() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::beforeFirst() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -489,7 +489,7 @@ void SAL_CALL KabResultSet::beforeFirst() throw(SQLException, RuntimeException, m_nRowPos = -1; } -void SAL_CALL KabResultSet::afterLast() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::afterLast() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -499,7 +499,7 @@ void SAL_CALL KabResultSet::afterLast() throw(SQLException, RuntimeException, st m_nRowPos = nAddressees; } -void SAL_CALL KabResultSet::close() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::close() { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -508,7 +508,7 @@ void SAL_CALL KabResultSet::close() throw(SQLException, RuntimeException, std::e dispose(); } -sal_Bool SAL_CALL KabResultSet::first() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSet::first() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -521,7 +521,7 @@ sal_Bool SAL_CALL KabResultSet::first() throw(SQLException, RuntimeException, st return true; } -sal_Bool SAL_CALL KabResultSet::last() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSet::last() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -534,7 +534,7 @@ sal_Bool SAL_CALL KabResultSet::last() throw(SQLException, RuntimeException, std return true; } -sal_Int32 SAL_CALL KabResultSet::getRow() throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabResultSet::getRow() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -542,7 +542,7 @@ sal_Int32 SAL_CALL KabResultSet::getRow() throw(SQLException, RuntimeException, return m_nRowPos; } -sal_Bool SAL_CALL KabResultSet::absolute(sal_Int32 row) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSet::absolute(sal_Int32 row) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -556,7 +556,7 @@ sal_Bool SAL_CALL KabResultSet::absolute(sal_Int32 row) throw(SQLException, Runt return true; } -sal_Bool SAL_CALL KabResultSet::relative(sal_Int32 row) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSet::relative(sal_Int32 row) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -564,7 +564,7 @@ sal_Bool SAL_CALL KabResultSet::relative(sal_Int32 row) throw(SQLException, Runt return absolute(m_nRowPos + row); } -sal_Bool SAL_CALL KabResultSet::next() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSet::next() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -572,7 +572,7 @@ sal_Bool SAL_CALL KabResultSet::next() throw(SQLException, RuntimeException, std return absolute(m_nRowPos + 1); } -sal_Bool SAL_CALL KabResultSet::previous() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSet::previous() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -580,7 +580,7 @@ sal_Bool SAL_CALL KabResultSet::previous() throw(SQLException, RuntimeException, return absolute(m_nRowPos - 1); } -Reference< XInterface > SAL_CALL KabResultSet::getStatement() throw(SQLException, RuntimeException, std::exception) +Reference< XInterface > SAL_CALL KabResultSet::getStatement() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -589,7 +589,7 @@ Reference< XInterface > SAL_CALL KabResultSet::getStatement() throw(SQLException return xStatement; } -sal_Bool SAL_CALL KabResultSet::rowDeleted() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSet::rowDeleted() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -597,7 +597,7 @@ sal_Bool SAL_CALL KabResultSet::rowDeleted() throw(SQLException, RuntimeExceptio return false; } -sal_Bool SAL_CALL KabResultSet::rowInserted() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSet::rowInserted() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -605,7 +605,7 @@ sal_Bool SAL_CALL KabResultSet::rowInserted() throw(SQLException, RuntimeExcepti return false; } -sal_Bool SAL_CALL KabResultSet::rowUpdated() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSet::rowUpdated() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -613,7 +613,7 @@ sal_Bool SAL_CALL KabResultSet::rowUpdated() throw(SQLException, RuntimeExceptio return false; } -sal_Bool SAL_CALL KabResultSet::wasNull() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSet::wasNull() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -621,22 +621,22 @@ sal_Bool SAL_CALL KabResultSet::wasNull() throw(SQLException, RuntimeException, return m_bWasNull; } -void SAL_CALL KabResultSet::cancel() throw(RuntimeException, std::exception) +void SAL_CALL KabResultSet::cancel() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::clearWarnings() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::clearWarnings() { } -Any SAL_CALL KabResultSet::getWarnings() throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL KabResultSet::getWarnings() { return Any(); } -void SAL_CALL KabResultSet::insertRow() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::insertRow() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -644,7 +644,7 @@ void SAL_CALL KabResultSet::insertRow() throw(SQLException, RuntimeException, st // you only have to implement this if you want to insert new rows } -void SAL_CALL KabResultSet::updateRow() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::updateRow() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -652,19 +652,19 @@ void SAL_CALL KabResultSet::updateRow() throw(SQLException, RuntimeException, st // only when you allow updates } -void SAL_CALL KabResultSet::deleteRow() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::deleteRow() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::cancelRowUpdates() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::cancelRowUpdates() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::moveToInsertRow() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::moveToInsertRow() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -672,122 +672,122 @@ void SAL_CALL KabResultSet::moveToInsertRow() throw(SQLException, RuntimeExcepti // only when you allow inserts } -void SAL_CALL KabResultSet::moveToCurrentRow() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::moveToCurrentRow() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateNull(sal_Int32) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::updateNull(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateBoolean(sal_Int32, sal_Bool) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::updateBoolean(sal_Int32, sal_Bool) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateByte(sal_Int32, sal_Int8) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::updateByte(sal_Int32, sal_Int8) { checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); } -void SAL_CALL KabResultSet::updateShort(sal_Int32, sal_Int16) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::updateShort(sal_Int32, sal_Int16) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateInt(sal_Int32, sal_Int32) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::updateInt(sal_Int32, sal_Int32) { checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); } -void SAL_CALL KabResultSet::updateLong(sal_Int32, sal_Int64) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::updateLong(sal_Int32, sal_Int64) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateFloat(sal_Int32, float) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::updateFloat(sal_Int32, float) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateDouble(sal_Int32, double) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::updateDouble(sal_Int32, double) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateString(sal_Int32, const OUString&) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::updateString(sal_Int32, const OUString&) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateBytes(sal_Int32, const Sequence< sal_Int8 >&) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::updateBytes(sal_Int32, const Sequence< sal_Int8 >&) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateDate(sal_Int32, const cssu::Date&) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::updateDate(sal_Int32, const cssu::Date&) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateTime(sal_Int32, const cssu::Time&) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::updateTime(sal_Int32, const cssu::Time&) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateTimestamp(sal_Int32, const cssu::DateTime&) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::updateTimestamp(sal_Int32, const cssu::DateTime&) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateBinaryStream(sal_Int32, const Reference< XInputStream >&, sal_Int32) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::updateBinaryStream(sal_Int32, const Reference< XInputStream >&, sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateCharacterStream(sal_Int32, const Reference< XInputStream >&, sal_Int32) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::updateCharacterStream(sal_Int32, const Reference< XInputStream >&, sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::refreshRow() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::refreshRow() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateObject(sal_Int32, const Any&) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::updateObject(sal_Int32, const Any&) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL KabResultSet::updateNumericObject(sal_Int32, const Any&, sal_Int32) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabResultSet::updateNumericObject(sal_Int32, const Any&, sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); } // XRowLocate -Any SAL_CALL KabResultSet::getBookmark() throw( SQLException, RuntimeException, std::exception) +Any SAL_CALL KabResultSet::getBookmark() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -803,7 +803,7 @@ Any SAL_CALL KabResultSet::getBookmark() throw( SQLException, RuntimeException, return Any(); } -sal_Bool SAL_CALL KabResultSet::moveToBookmark(const Any& bookmark) throw( SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSet::moveToBookmark(const Any& bookmark) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -825,7 +825,7 @@ sal_Bool SAL_CALL KabResultSet::moveToBookmark(const Any& bookmark) throw( SQLE return false; } -sal_Bool SAL_CALL KabResultSet::moveRelativeToBookmark(const Any& bookmark, sal_Int32 rows) throw( SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSet::moveRelativeToBookmark(const Any& bookmark, sal_Int32 rows) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -846,7 +846,7 @@ sal_Bool SAL_CALL KabResultSet::moveRelativeToBookmark(const Any& bookmark, sal return false; } -sal_Int32 SAL_CALL KabResultSet::compareBookmarks(const Any& firstItem, const Any& secondItem) throw( SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabResultSet::compareBookmarks(const Any& firstItem, const Any& secondItem) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -861,12 +861,12 @@ sal_Int32 SAL_CALL KabResultSet::compareBookmarks(const Any& firstItem, const return CompareBookmark::EQUAL; } -sal_Bool SAL_CALL KabResultSet::hasOrderedBookmarks() throw( SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL KabResultSet::hasOrderedBookmarks() { return false; } -sal_Int32 SAL_CALL KabResultSet::hashBookmark(const Any& bookmark) throw( SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabResultSet::hashBookmark(const Any& bookmark) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -877,7 +877,7 @@ sal_Int32 SAL_CALL KabResultSet::hashBookmark(const Any& bookmark) throw( SQLEx } // XDeleteRows -Sequence< sal_Int32 > SAL_CALL KabResultSet::deleteRows(const Sequence< Any >&) throw( SQLException, RuntimeException, std::exception) +Sequence< sal_Int32 > SAL_CALL KabResultSet::deleteRows(const Sequence< Any >&) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -921,7 +921,6 @@ sal_Bool KabResultSet::convertFastPropertyValue( Any &, sal_Int32 nHandle, const Any& ) - throw (css::lang::IllegalArgumentException) { switch (nHandle) { @@ -942,7 +941,6 @@ sal_Bool KabResultSet::convertFastPropertyValue( void KabResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& ) - throw (Exception, std::exception) { switch (nHandle) { diff --git a/connectivity/source/drivers/kab/KResultSet.hxx b/connectivity/source/drivers/kab/KResultSet.hxx index e448b710a73b..8edef8d9f5d4 100644 --- a/connectivity/source/drivers/kab/KResultSet.hxx +++ b/connectivity/source/drivers/kab/KResultSet.hxx @@ -74,12 +74,10 @@ namespace connectivity css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, - const css::uno::Any& rValue) - throw (css::lang::IllegalArgumentException) override; + const css::uno::Any& rValue) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const css::uno::Any& rValue) - throw (css::uno::Exception, std::exception) override; + const css::uno::Any& rValue) override; virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle) const override; @@ -109,110 +107,110 @@ namespace connectivity virtual void SAL_CALL disposing() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; // XResultSet - virtual sal_Bool SAL_CALL isBeforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAfterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL beforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL afterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL first( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL last( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL next( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL previous( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL refreshRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowUpdated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowInserted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowDeleted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL isBeforeFirst( ) override; + virtual sal_Bool SAL_CALL isAfterLast( ) override; + virtual sal_Bool SAL_CALL isFirst( ) override; + virtual sal_Bool SAL_CALL isLast( ) override; + virtual void SAL_CALL beforeFirst( ) override; + virtual void SAL_CALL afterLast( ) override; + virtual sal_Bool SAL_CALL first( ) override; + virtual sal_Bool SAL_CALL last( ) override; + virtual sal_Int32 SAL_CALL getRow( ) override; + virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) override; + virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) override; + virtual sal_Bool SAL_CALL next( ) override; + virtual sal_Bool SAL_CALL previous( ) override; + virtual void SAL_CALL refreshRow( ) override; + virtual sal_Bool SAL_CALL rowUpdated( ) override; + virtual sal_Bool SAL_CALL rowInserted( ) override; + virtual sal_Bool SAL_CALL rowDeleted( ) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement( ) override; // XRow - virtual sal_Bool SAL_CALL wasNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL wasNull( ) override; + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) override; + virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override; + virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override; + virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override; + virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) override; + virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) override; + virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) override; + virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) override; + virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) override; + virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) override; + virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) override; + virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; + virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override; // XResultSetMetaDataSupplier - virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) override; // XCancellable - virtual void SAL_CALL cancel( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cancel( ) override; // XCloseable - virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) override; // XWarningsSupplier - virtual css::uno::Any SAL_CALL getWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getWarnings( ) override; + virtual void SAL_CALL clearWarnings( ) override; // XResultSetUpdate - virtual void SAL_CALL insertRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL deleteRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL cancelRowUpdates( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL moveToInsertRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL moveToCurrentRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertRow( ) override; + virtual void SAL_CALL updateRow( ) override; + virtual void SAL_CALL deleteRow( ) override; + virtual void SAL_CALL cancelRowUpdates( ) override; + virtual void SAL_CALL moveToInsertRow( ) override; + virtual void SAL_CALL moveToCurrentRow( ) override; // XRowUpdate - virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) override; + virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) override; + virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) override; + virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) override; + virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) override; + virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) override; + virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) override; + virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) override; + virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) override; + virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) override; + virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) override; + virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) override; + virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) override; + virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) override; + virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) override; // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) override; // XRowLocate - virtual css::uno::Any SAL_CALL getBookmark( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& firstItem, const css::uno::Any& secondItem ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasOrderedBookmarks( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getBookmark( ) override; + virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) override; + virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) override; + virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& firstItem, const css::uno::Any& secondItem ) override; + virtual sal_Bool SAL_CALL hasOrderedBookmarks( ) override; + virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) override; // XDeleteRows - virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const css::uno::Sequence< css::uno::Any >& rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const css::uno::Sequence< css::uno::Any >& rows ) override; }; } } diff --git a/connectivity/source/drivers/kab/KResultSetMetaData.cxx b/connectivity/source/drivers/kab/KResultSetMetaData.cxx index 35290e538d84..88669bd2d6fa 100644 --- a/connectivity/source/drivers/kab/KResultSetMetaData.cxx +++ b/connectivity/source/drivers/kab/KResultSetMetaData.cxx @@ -36,7 +36,7 @@ KabResultSetMetaData::~KabResultSetMetaData() { } -void KabResultSetMetaData::setKabFields(const ::rtl::Reference &xColumns) throw(SQLException) +void KabResultSetMetaData::setKabFields(const ::rtl::Reference &xColumns) { OSQLColumns::Vector::const_iterator aIter; static const char aName[] = "Name"; @@ -52,32 +52,32 @@ void KabResultSetMetaData::setKabFields(const ::rtl::Reference &xColumns) throw(css::sdbc::SQLException); + const ::rtl::Reference &xColumns); inline sal_uInt32 fieldAtColumn(sal_Int32 columnIndex) const { return m_aKabFields[columnIndex - 1]; } - virtual sal_Int32 SAL_CALL getColumnCount( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getColumnCount( ) override; + virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnName( sal_Int32 column ) override; + virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) override; + virtual OUString SAL_CALL getTableName( sal_Int32 column ) override; + virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) override; }; } } diff --git a/connectivity/source/drivers/kab/KStatement.cxx b/connectivity/source/drivers/kab/KStatement.cxx index f611f15bdd86..83e0bf26efee 100644 --- a/connectivity/source/drivers/kab/KStatement.cxx +++ b/connectivity/source/drivers/kab/KStatement.cxx @@ -75,17 +75,17 @@ KabCommonStatement::~KabCommonStatement() { } -void KabCommonStatement::resetParameters() const throw(css::sdbc::SQLException) +void KabCommonStatement::resetParameters() const { lcl_throwError(STR_PARA_ONLY_PREPARED); } -void KabCommonStatement::getNextParameter(OUString &) const throw(css::sdbc::SQLException) +void KabCommonStatement::getNextParameter(OUString &) const { lcl_throwError(STR_PARA_ONLY_PREPARED); } -KabCondition *KabCommonStatement::analyseWhereClause(const OSQLParseNode *pParseNode) const throw(SQLException) +KabCondition *KabCommonStatement::analyseWhereClause(const OSQLParseNode *pParseNode) const { if (pParseNode->count() == 3) { @@ -232,7 +232,7 @@ KabCondition *KabCommonStatement::analyseWhereClause(const OSQLParseNode *pParse return nullptr; } -KabOrder *KabCommonStatement::analyseOrderByClause(const OSQLParseNode *pParseNode) const throw(SQLException) +KabOrder *KabCommonStatement::analyseOrderByClause(const OSQLParseNode *pParseNode) const { if (SQL_ISRULE(pParseNode, ordering_spec_commalist)) { @@ -291,7 +291,7 @@ bool KabCommonStatement::isTableKnown(KabResultSet *pResult) const return true; } -void KabCommonStatement::setKabFields(KabResultSet *pResult) const throw(SQLException) +void KabCommonStatement::setKabFields(KabResultSet *pResult) const { ::rtl::Reference xColumns; // selected columns @@ -303,7 +303,7 @@ void KabCommonStatement::setKabFields(KabResultSet *pResult) const throw(SQLExce pResult->getKabMetaData()->setKabFields(xColumns); } -void KabCommonStatement::selectAddressees(KabResultSet *pResult) const throw(SQLException) +void KabCommonStatement::selectAddressees(KabResultSet *pResult) const { const OSQLParseNode *pParseNode; @@ -328,7 +328,7 @@ void KabCommonStatement::selectAddressees(KabResultSet *pResult) const throw(SQL pResult->allKabAddressees(); } -void KabCommonStatement::sortAddressees(KabResultSet *pResult) const throw(SQLException) +void KabCommonStatement::sortAddressees(KabResultSet *pResult) const { const OSQLParseNode *pParseNode; @@ -345,7 +345,7 @@ void KabCommonStatement::sortAddressees(KabResultSet *pResult) const throw(SQLEx } } -Any SAL_CALL KabCommonStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL KabCommonStatement::queryInterface( const Type & rType ) { Any aRet = KabCommonStatement_BASE::queryInterface(rType); if (!aRet.hasValue()) @@ -353,7 +353,7 @@ Any SAL_CALL KabCommonStatement::queryInterface( const Type & rType ) throw(Runt return aRet; } -Sequence< Type > SAL_CALL KabCommonStatement::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL KabCommonStatement::getTypes( ) { ::cppu::OTypeCollection aTypes( cppu::UnoType::get(), cppu::UnoType::get(), @@ -362,7 +362,7 @@ Sequence< Type > SAL_CALL KabCommonStatement::getTypes( ) throw(RuntimeExceptio return comphelper::concatSequences(aTypes.getTypes(),KabCommonStatement_BASE::getTypes()); } -void SAL_CALL KabCommonStatement::cancel( ) throw(RuntimeException, std::exception) +void SAL_CALL KabCommonStatement::cancel( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -370,7 +370,7 @@ void SAL_CALL KabCommonStatement::cancel( ) throw(RuntimeException, std::except // cancel the current sql statement } -void SAL_CALL KabCommonStatement::close( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabCommonStatement::close( ) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -381,7 +381,7 @@ void SAL_CALL KabCommonStatement::close( ) throw(SQLException, RuntimeException } sal_Bool SAL_CALL KabCommonStatement::execute( - const OUString& sql ) throw(SQLException, RuntimeException, std::exception) + const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); @@ -392,7 +392,7 @@ sal_Bool SAL_CALL KabCommonStatement::execute( } Reference< XResultSet > SAL_CALL KabCommonStatement::executeQuery( - const OUString& sql ) throw(SQLException, RuntimeException, std::exception) + const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); @@ -430,7 +430,7 @@ Reference< XResultSet > SAL_CALL KabCommonStatement::executeQuery( return xRS; } -Reference< XConnection > SAL_CALL KabCommonStatement::getConnection( ) throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > SAL_CALL KabCommonStatement::getConnection( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); @@ -439,7 +439,7 @@ Reference< XConnection > SAL_CALL KabCommonStatement::getConnection( ) throw(SQ return m_pConnection; } -sal_Int32 SAL_CALL KabCommonStatement::executeUpdate( const OUString& ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL KabCommonStatement::executeUpdate( const OUString& ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); @@ -448,7 +448,7 @@ sal_Int32 SAL_CALL KabCommonStatement::executeUpdate( const OUString& ) throw(SQ return 0; } -Any SAL_CALL KabCommonStatement::getWarnings( ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL KabCommonStatement::getWarnings( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); @@ -456,7 +456,7 @@ Any SAL_CALL KabCommonStatement::getWarnings( ) throw(SQLException, RuntimeExce return makeAny(m_aLastWarning); } -void SAL_CALL KabCommonStatement::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL KabCommonStatement::clearWarnings( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); @@ -504,14 +504,14 @@ sal_Bool KabCommonStatement::convertFastPropertyValue( Any &, Any &, sal_Int32, - const Any&) throw (css::lang::IllegalArgumentException) + const Any&) { bool bConverted = false; // here we have to try to convert return bConverted; } -void KabCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any&) throw (Exception, std::exception) +void KabCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any&) { // set the value to whatever is necessary switch (nHandle) @@ -560,7 +560,7 @@ void SAL_CALL KabCommonStatement::release() throw() KabCommonStatement_BASE::release(); } -Reference< css::beans::XPropertySetInfo > SAL_CALL KabCommonStatement::getPropertySetInfo( ) throw(RuntimeException, std::exception) +Reference< css::beans::XPropertySetInfo > SAL_CALL KabCommonStatement::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/kab/KStatement.hxx b/connectivity/source/drivers/kab/KStatement.hxx index e76522ceb206..197b938f4266 100644 --- a/connectivity/source/drivers/kab/KStatement.hxx +++ b/connectivity/source/drivers/kab/KStatement.hxx @@ -60,13 +60,13 @@ namespace connectivity protected: class KabCondition *analyseWhereClause( - const OSQLParseNode *pParseNode) const throw(css::sdbc::SQLException); + const OSQLParseNode *pParseNode) const; class KabOrder *analyseOrderByClause( - const OSQLParseNode *pParseNode) const throw(css::sdbc::SQLException); + const OSQLParseNode *pParseNode) const; bool isTableKnown(class KabResultSet *pResult) const; - void setKabFields(class KabResultSet *pResult) const throw(css::sdbc::SQLException); - void selectAddressees(KabResultSet *pResult) const throw(css::sdbc::SQLException); - void sortAddressees(KabResultSet *pResult) const throw(css::sdbc::SQLException); + void setKabFields(class KabResultSet *pResult) const; + void selectAddressees(KabResultSet *pResult) const; + void sortAddressees(KabResultSet *pResult) const; // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override; @@ -77,17 +77,17 @@ namespace connectivity css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, - const css::uno::Any& rValue) throw (css::lang::IllegalArgumentException) override; + const css::uno::Any& rValue) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const css::uno::Any& rValue) throw (css::uno::Exception, std::exception) override; + const css::uno::Any& rValue) override; virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle) const override; using OPropertySetHelper::getFastPropertyValue; - virtual void resetParameters() const throw(css::sdbc::SQLException); - virtual void getNextParameter(OUString &rParameter) const throw(css::sdbc::SQLException); + virtual void resetParameters() const; + virtual void getNextParameter(OUString &rParameter) const; virtual ~KabCommonStatement() override; public: @@ -104,39 +104,39 @@ namespace connectivity virtual void SAL_CALL acquire() throw() override; virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType - ) throw(css::uno::RuntimeException, std::exception) override; + ) override; // XTypeProvider virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( - ) throw(css::uno::RuntimeException, std::exception) override; + ) override; // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( - ) throw(css::uno::RuntimeException, std::exception) override; + ) override; // XStatement virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( - const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + const OUString& sql ) override; virtual sal_Int32 SAL_CALL executeUpdate( - const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + const OUString& sql ) override; virtual sal_Bool SAL_CALL execute( - const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + const OUString& sql ) override; virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( - ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + ) override; // XWarningsSupplier virtual css::uno::Any SAL_CALL getWarnings( - ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + ) override; virtual void SAL_CALL clearWarnings( - ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + ) override; // XCancellable virtual void SAL_CALL cancel( - ) throw(css::uno::RuntimeException, std::exception) override; + ) override; // XCloseable virtual void SAL_CALL close( - ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + ) override; }; diff --git a/connectivity/source/drivers/kab/KTables.cxx b/connectivity/source/drivers/kab/KTables.cxx index 6d725e6101e8..d84601f44d89 100644 --- a/connectivity/source/drivers/kab/KTables.cxx +++ b/connectivity/source/drivers/kab/KTables.cxx @@ -66,7 +66,7 @@ sdbcx::ObjectType KabTables::createObject(const OUString& _rName) return xRet; } -void KabTables::impl_refresh( ) throw(RuntimeException) +void KabTables::impl_refresh( ) { static_cast(m_rParent).refreshTables(); } diff --git a/connectivity/source/drivers/kab/KTables.hxx b/connectivity/source/drivers/kab/KTables.hxx index 5a9c9ad2a927..564ca3faba52 100644 --- a/connectivity/source/drivers/kab/KTables.hxx +++ b/connectivity/source/drivers/kab/KTables.hxx @@ -33,7 +33,7 @@ namespace connectivity protected: virtual sdbcx::ObjectType createObject(const OUString& _rName) override; - virtual void impl_refresh() throw(css::uno::RuntimeException) override; + virtual void impl_refresh() override; public: KabTables( diff --git a/connectivity/source/drivers/kab/kcondition.cxx b/connectivity/source/drivers/kab/kcondition.cxx index 5801a454a062..3721585e3109 100644 --- a/connectivity/source/drivers/kab/kcondition.cxx +++ b/connectivity/source/drivers/kab/kcondition.cxx @@ -50,7 +50,7 @@ bool KabConditionConstant::eval(const ::KABC::Addressee &) const return m_bValue; } -KabConditionColumn::KabConditionColumn(const OUString &sColumnName) throw(SQLException) +KabConditionColumn::KabConditionColumn(const OUString &sColumnName) : KabCondition(), m_nFieldNumber(findKabField(sColumnName)) { @@ -68,7 +68,7 @@ bool KabConditionColumn::isAlwaysFalse() const return false; } -KabConditionNull::KabConditionNull(const OUString &sColumnName) throw(SQLException) +KabConditionNull::KabConditionNull(const OUString &sColumnName) : KabConditionColumn(sColumnName) { } @@ -82,7 +82,7 @@ bool KabConditionNull::eval(const ::KABC::Addressee &aAddressee) const // But it might do it someday } -KabConditionNotNull::KabConditionNotNull(const OUString &sColumnName) throw(SQLException) +KabConditionNotNull::KabConditionNotNull(const OUString &sColumnName) : KabConditionColumn(sColumnName) { } @@ -96,13 +96,13 @@ bool KabConditionNotNull::eval(const ::KABC::Addressee &aAddressee) const // But it might do it someday } -KabConditionCompare::KabConditionCompare(const OUString &sColumnName, const OUString &sMatchString) throw(SQLException) +KabConditionCompare::KabConditionCompare(const OUString &sColumnName, const OUString &sMatchString) : KabConditionColumn(sColumnName), m_sMatchString(sMatchString) { } -KabConditionEqual::KabConditionEqual(const OUString &sColumnName, const OUString &sMatchString) throw(SQLException) +KabConditionEqual::KabConditionEqual(const OUString &sColumnName, const OUString &sMatchString) : KabConditionCompare(sColumnName, sMatchString) { } @@ -121,7 +121,7 @@ bool KabConditionEqual::eval(const ::KABC::Addressee &aAddressee) const return sValue == m_sMatchString; } -KabConditionDifferent::KabConditionDifferent(const OUString &sColumnName, const OUString &sMatchString) throw(SQLException) +KabConditionDifferent::KabConditionDifferent(const OUString &sColumnName, const OUString &sMatchString) : KabConditionCompare(sColumnName, sMatchString) { } @@ -136,7 +136,7 @@ bool KabConditionDifferent::eval(const ::KABC::Addressee &aAddressee) const return sValue != m_sMatchString; } -KabConditionSimilar::KabConditionSimilar(const OUString &sColumnName, const OUString &sMatchString) throw(SQLException) +KabConditionSimilar::KabConditionSimilar(const OUString &sColumnName, const OUString &sMatchString) : KabConditionCompare(sColumnName, sMatchString) { } diff --git a/connectivity/source/drivers/kab/kcondition.hxx b/connectivity/source/drivers/kab/kcondition.hxx index a6b1cd8808b6..5225ffa573b4 100644 --- a/connectivity/source/drivers/kab/kcondition.hxx +++ b/connectivity/source/drivers/kab/kcondition.hxx @@ -59,7 +59,7 @@ class KabConditionColumn : public KabCondition public: explicit KabConditionColumn( - const OUString &sColumnName) throw(css::sdbc::SQLException); + const OUString &sColumnName); virtual bool isAlwaysTrue() const override; virtual bool isAlwaysFalse() const override; }; @@ -68,7 +68,7 @@ class KabConditionNull : public KabConditionColumn { public: explicit KabConditionNull( - const OUString &sColumnName) throw(css::sdbc::SQLException); + const OUString &sColumnName); virtual bool eval(const ::KABC::Addressee &aAddressee) const override; }; @@ -76,7 +76,7 @@ class KabConditionNotNull : public KabConditionColumn { public: explicit KabConditionNotNull( - const OUString &sColumnName) throw(css::sdbc::SQLException); + const OUString &sColumnName); virtual bool eval(const ::KABC::Addressee &aAddressee) const override; }; @@ -88,7 +88,7 @@ class KabConditionCompare : public KabConditionColumn public: KabConditionCompare( const OUString &sColumnName, - const OUString &sMatchString) throw(css::sdbc::SQLException); + const OUString &sMatchString); }; class KabConditionEqual : public KabConditionCompare @@ -96,7 +96,7 @@ class KabConditionEqual : public KabConditionCompare public: KabConditionEqual( const OUString &sColumnName, - const OUString &sMatchString) throw(css::sdbc::SQLException); + const OUString &sMatchString); virtual bool eval(const ::KABC::Addressee &aAddressee) const override; }; @@ -105,7 +105,7 @@ class KabConditionDifferent : public KabConditionCompare public: KabConditionDifferent( const OUString &sColumnName, - const OUString &sMatchString) throw(css::sdbc::SQLException); + const OUString &sMatchString); virtual bool eval(const ::KABC::Addressee &aAddressee) const override; }; @@ -114,7 +114,7 @@ class KabConditionSimilar : public KabConditionCompare public: KabConditionSimilar( const OUString &sColumnName, - const OUString &sMatchString) throw(css::sdbc::SQLException); + const OUString &sMatchString); virtual bool eval(const ::KABC::Addressee &aAddressee) const override; }; diff --git a/connectivity/source/drivers/kab/kfields.cxx b/connectivity/source/drivers/kab/kfields.cxx index 0ecc78ae5c23..e86ea64efa4d 100644 --- a/connectivity/source/drivers/kab/kfields.cxx +++ b/connectivity/source/drivers/kab/kfields.cxx @@ -47,7 +47,7 @@ QString valueOfKabField(const ::KABC::Addressee &aAddressee, sal_Int32 nFieldNum } // search the KDE address book field number of a given column name -sal_uInt32 findKabField(const OUString& columnName) throw(SQLException) +sal_uInt32 findKabField(const OUString& columnName) { QString aQtName; OUString aName; diff --git a/connectivity/source/drivers/kab/kfields.hxx b/connectivity/source/drivers/kab/kfields.hxx index 9b3a9273188b..02121deaf5c9 100644 --- a/connectivity/source/drivers/kab/kfields.hxx +++ b/connectivity/source/drivers/kab/kfields.hxx @@ -32,7 +32,7 @@ namespace connectivity namespace kab { QString valueOfKabField(const ::KABC::Addressee &aAddressee, sal_Int32 nFieldNumber); - sal_uInt32 findKabField(const OUString& columnName) throw(css::sdbc::SQLException); + sal_uInt32 findKabField(const OUString& columnName); } } diff --git a/connectivity/source/drivers/macab/MacabCatalog.cxx b/connectivity/source/drivers/macab/MacabCatalog.cxx index 8af97351e022..91bec0a78a78 100644 --- a/connectivity/source/drivers/macab/MacabCatalog.cxx +++ b/connectivity/source/drivers/macab/MacabCatalog.cxx @@ -85,7 +85,7 @@ const OUString& MacabCatalog::getDot() // XTablesSupplier -Reference< XNameAccess > SAL_CALL MacabCatalog::getTables( ) throw(RuntimeException) +Reference< XNameAccess > SAL_CALL MacabCatalog::getTables( ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); diff --git a/connectivity/source/drivers/macab/MacabCatalog.hxx b/connectivity/source/drivers/macab/MacabCatalog.hxx index d893d3d283a7..cf79a19ea889 100644 --- a/connectivity/source/drivers/macab/MacabCatalog.hxx +++ b/connectivity/source/drivers/macab/MacabCatalog.hxx @@ -47,7 +47,7 @@ namespace connectivity // XTablesSupplier virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables( - ) throw(css::uno::RuntimeException) override; + ) override; }; } } diff --git a/connectivity/source/drivers/macab/MacabColumns.cxx b/connectivity/source/drivers/macab/MacabColumns.cxx index f74f952d88cd..df09ef9c7715 100644 --- a/connectivity/source/drivers/macab/MacabColumns.cxx +++ b/connectivity/source/drivers/macab/MacabColumns.cxx @@ -78,7 +78,7 @@ sdbcx::ObjectType MacabColumns::createObject(const OUString& _rName) return xRet; } -void MacabColumns::impl_refresh() throw(RuntimeException) +void MacabColumns::impl_refresh() { m_pTable->refreshColumns(); } diff --git a/connectivity/source/drivers/macab/MacabColumns.hxx b/connectivity/source/drivers/macab/MacabColumns.hxx index d2c7f502e2dc..45858d44657e 100644 --- a/connectivity/source/drivers/macab/MacabColumns.hxx +++ b/connectivity/source/drivers/macab/MacabColumns.hxx @@ -33,7 +33,7 @@ namespace connectivity MacabTable* m_pTable; virtual sdbcx::ObjectType createObject(const OUString& _rName) override; - virtual void impl_refresh() throw(css::uno::RuntimeException) override; + virtual void impl_refresh() override; public: MacabColumns( MacabTable* _pTable, diff --git a/connectivity/source/drivers/macab/MacabConnection.cxx b/connectivity/source/drivers/macab/MacabConnection.cxx index 7b1d8dfc93bd..b966538b15e4 100644 --- a/connectivity/source/drivers/macab/MacabConnection.cxx +++ b/connectivity/source/drivers/macab/MacabConnection.cxx @@ -59,7 +59,7 @@ void SAL_CALL MacabConnection::release() throw() release_ChildImpl(); } -void MacabConnection::construct(const OUString&, const Sequence< PropertyValue >&) throw(SQLException) +void MacabConnection::construct(const OUString&, const Sequence< PropertyValue >&) { osl_atomic_increment( &m_refCount ); @@ -70,7 +70,7 @@ void MacabConnection::construct(const OUString&, const Sequence< PropertyValue > } // XServiceInfo -Reference< XStatement > SAL_CALL MacabConnection::createStatement( ) throw(SQLException, RuntimeException) +Reference< XStatement > SAL_CALL MacabConnection::createStatement( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabConnection_BASE::rBHelper.bDisposed); @@ -82,7 +82,7 @@ Reference< XStatement > SAL_CALL MacabConnection::createStatement( ) throw(SQLE return xReturn; } -Reference< XPreparedStatement > SAL_CALL MacabConnection::prepareStatement( const OUString& _sSql ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL MacabConnection::prepareStatement( const OUString& _sSql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabConnection_BASE::rBHelper.bDisposed); @@ -94,7 +94,7 @@ Reference< XPreparedStatement > SAL_CALL MacabConnection::prepareStatement( cons return xReturn; } -Reference< XPreparedStatement > SAL_CALL MacabConnection::prepareCall( const OUString& ) throw(SQLException, RuntimeException) +Reference< XPreparedStatement > SAL_CALL MacabConnection::prepareCall( const OUString& ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabConnection_BASE::rBHelper.bDisposed); @@ -103,7 +103,7 @@ Reference< XPreparedStatement > SAL_CALL MacabConnection::prepareCall( const OUS return nullptr; } -OUString SAL_CALL MacabConnection::nativeSQL( const OUString& _sSql ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabConnection::nativeSQL( const OUString& _sSql ) { ::osl::MutexGuard aGuard( m_aMutex ); // when you need to transform SQL92 to you driver specific you can do it here @@ -111,14 +111,14 @@ OUString SAL_CALL MacabConnection::nativeSQL( const OUString& _sSql ) throw(SQLE return _sSql; } -void SAL_CALL MacabConnection::setAutoCommit( sal_Bool ) throw(SQLException, RuntimeException) +void SAL_CALL MacabConnection::setAutoCommit( sal_Bool ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabConnection_BASE::rBHelper.bDisposed); // here you have to set your commit mode please have a look at the jdbc documentation to get a clear explanation } -sal_Bool SAL_CALL MacabConnection::getAutoCommit( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabConnection::getAutoCommit( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabConnection_BASE::rBHelper.bDisposed); @@ -128,7 +128,7 @@ sal_Bool SAL_CALL MacabConnection::getAutoCommit( ) throw(SQLException, Runtime return true; } -void SAL_CALL MacabConnection::commit( ) throw(SQLException, RuntimeException) +void SAL_CALL MacabConnection::commit( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabConnection_BASE::rBHelper.bDisposed); @@ -136,7 +136,7 @@ void SAL_CALL MacabConnection::commit( ) throw(SQLException, RuntimeException) // when you database does support transactions you should commit here } -void SAL_CALL MacabConnection::rollback( ) throw(SQLException, RuntimeException) +void SAL_CALL MacabConnection::rollback( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabConnection_BASE::rBHelper.bDisposed); @@ -144,7 +144,7 @@ void SAL_CALL MacabConnection::rollback( ) throw(SQLException, RuntimeException // same as commit but for the other case } -sal_Bool SAL_CALL MacabConnection::isClosed( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabConnection::isClosed( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -152,7 +152,7 @@ sal_Bool SAL_CALL MacabConnection::isClosed( ) throw(SQLException, RuntimeExcep return MacabConnection_BASE::rBHelper.bDisposed; } -Reference< XDatabaseMetaData > SAL_CALL MacabConnection::getMetaData( ) throw(SQLException, RuntimeException) +Reference< XDatabaseMetaData > SAL_CALL MacabConnection::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabConnection_BASE::rBHelper.bDisposed); @@ -169,7 +169,7 @@ Reference< XDatabaseMetaData > SAL_CALL MacabConnection::getMetaData( ) throw(S return xMetaData; } -void SAL_CALL MacabConnection::setReadOnly( sal_Bool ) throw(SQLException, RuntimeException) +void SAL_CALL MacabConnection::setReadOnly( sal_Bool ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabConnection_BASE::rBHelper.bDisposed); @@ -177,7 +177,7 @@ void SAL_CALL MacabConnection::setReadOnly( sal_Bool ) throw(SQLException, Runti // set you connection to readonly } -sal_Bool SAL_CALL MacabConnection::isReadOnly( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabConnection::isReadOnly( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabConnection_BASE::rBHelper.bDisposed); @@ -186,7 +186,7 @@ sal_Bool SAL_CALL MacabConnection::isReadOnly( ) throw(SQLException, RuntimeExc return false; } -void SAL_CALL MacabConnection::setCatalog( const OUString& ) throw(SQLException, RuntimeException) +void SAL_CALL MacabConnection::setCatalog( const OUString& ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabConnection_BASE::rBHelper.bDisposed); @@ -194,7 +194,7 @@ void SAL_CALL MacabConnection::setCatalog( const OUString& ) throw(SQLException, // if your database doesn't work with catalogs you go to next method otherwise you know what to do } -OUString SAL_CALL MacabConnection::getCatalog( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabConnection::getCatalog( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabConnection_BASE::rBHelper.bDisposed); @@ -204,7 +204,7 @@ OUString SAL_CALL MacabConnection::getCatalog( ) throw(SQLException, RuntimeExc return OUString(); } -void SAL_CALL MacabConnection::setTransactionIsolation( sal_Int32 ) throw(SQLException, RuntimeException) +void SAL_CALL MacabConnection::setTransactionIsolation( sal_Int32 ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabConnection_BASE::rBHelper.bDisposed); @@ -213,7 +213,7 @@ void SAL_CALL MacabConnection::setTransactionIsolation( sal_Int32 ) throw(SQLExc // please have a look at @see com.sun.star.sdbc.TransactionIsolation } -sal_Int32 SAL_CALL MacabConnection::getTransactionIsolation( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabConnection::getTransactionIsolation( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabConnection_BASE::rBHelper.bDisposed); @@ -223,7 +223,7 @@ sal_Int32 SAL_CALL MacabConnection::getTransactionIsolation( ) throw(SQLExcepti return TransactionIsolation::NONE; } -Reference< css::container::XNameAccess > SAL_CALL MacabConnection::getTypeMap( ) throw(SQLException, RuntimeException) +Reference< css::container::XNameAccess > SAL_CALL MacabConnection::getTypeMap( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabConnection_BASE::rBHelper.bDisposed); @@ -233,13 +233,13 @@ Reference< css::container::XNameAccess > SAL_CALL MacabConnection::getTypeMap( return nullptr; } -void SAL_CALL MacabConnection::setTypeMap( const Reference< css::container::XNameAccess >& ) throw(SQLException, RuntimeException) +void SAL_CALL MacabConnection::setTypeMap( const Reference< css::container::XNameAccess >& ) { // the other way around } // XCloseable -void SAL_CALL MacabConnection::close( ) throw(SQLException, RuntimeException) +void SAL_CALL MacabConnection::close( ) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -249,13 +249,13 @@ void SAL_CALL MacabConnection::close( ) throw(SQLException, RuntimeException) } // XWarningsSupplier -Any SAL_CALL MacabConnection::getWarnings( ) throw(SQLException, RuntimeException) +Any SAL_CALL MacabConnection::getWarnings( ) { // when you collected some warnings -> return it return Any(); } -void SAL_CALL MacabConnection::clearWarnings( ) throw(SQLException, RuntimeException) +void SAL_CALL MacabConnection::clearWarnings( ) { // you should clear your collected warnings here } diff --git a/connectivity/source/drivers/macab/MacabConnection.hxx b/connectivity/source/drivers/macab/MacabConnection.hxx index 0c225861275a..93d395a28d0f 100644 --- a/connectivity/source/drivers/macab/MacabConnection.hxx +++ b/connectivity/source/drivers/macab/MacabConnection.hxx @@ -66,14 +66,11 @@ namespace connectivity public: /// @throws css::sdbc::SQLException - virtual void construct( const OUString& url,const css::uno::Sequence< css::beans::PropertyValue >& info) throw(css::sdbc::SQLException); + virtual void construct( const OUString& url,const css::uno::Sequence< css::beans::PropertyValue >& info); explicit MacabConnection(MacabDriver* _pDriver); virtual ~MacabConnection() override; - /// @throws css::sdbc::SQLException - void closeAllStatements () throw( css::sdbc::SQLException); - // OComponentHelper virtual void SAL_CALL disposing() override; @@ -84,31 +81,31 @@ namespace connectivity DECLARE_SERVICE_INFO(); // XConnection - virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL getAutoCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL commit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL rollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isClosed( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isReadOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getCatalog( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) override; + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) override; + virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) override; + virtual sal_Bool SAL_CALL getAutoCommit( ) override; + virtual void SAL_CALL commit( ) override; + virtual void SAL_CALL rollback( ) override; + virtual sal_Bool SAL_CALL isClosed( ) override; + virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) override; + virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) override; + virtual sal_Bool SAL_CALL isReadOnly( ) override; + virtual void SAL_CALL setCatalog( const OUString& catalog ) override; + virtual OUString SAL_CALL getCatalog( ) override; + virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) override; + virtual sal_Int32 SAL_CALL getTransactionIsolation( ) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) override; + virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; // XCloseable - virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL close( ) override; // XWarningsSupplier - virtual css::uno::Any SAL_CALL getWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL clearWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Any SAL_CALL getWarnings( ) override; + virtual void SAL_CALL clearWarnings( ) override; // needed for the SQL interpreter css::uno::Reference< css::sdbcx::XTablesSupplier > SAL_CALL createCatalog(); diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx index fa3e9c927b5a..0dbeb5a4b328 100644 --- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx +++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx @@ -54,7 +54,7 @@ MacabDatabaseMetaData::~MacabDatabaseMetaData() { } -OUString SAL_CALL MacabDatabaseMetaData::getCatalogSeparator( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getCatalogSeparator( ) { OUString aVal; if (m_bUseCatalog) @@ -64,73 +64,73 @@ OUString SAL_CALL MacabDatabaseMetaData::getCatalogSeparator( ) throw(SQLExcept return aVal; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxBinaryLiteralLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxRowSize( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxRowSize( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxCatalogNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxCatalogNameLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxCharLiteralLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnNameLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnsInIndex( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxCursorNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxCursorNameLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxConnections( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxConnections( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnsInTable( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxStatementLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxStatementLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxTableNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxTableNameLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxTablesInSelect( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxTablesInSelect( ) { // MaxTablesInSelect describes how many tables can participate in the FROM part of a given SELECT statement, // currently, the resultset/statement implementations can cope with one table only @@ -138,63 +138,63 @@ sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxTablesInSelect( ) throw(SQLExce return nValue; } -sal_Bool SAL_CALL MacabDatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::storesLowerCaseIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::storesLowerCaseIdentifiers( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::storesMixedCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::storesMixedCaseQuotedIdentifiers( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::storesMixedCaseIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::storesMixedCaseIdentifiers( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::storesUpperCaseIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::storesUpperCaseIdentifiers( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsAlterTableWithAddColumn( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsAlterTableWithAddColumn( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsAlterTableWithDropColumn( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsAlterTableWithDropColumn( ) { return false; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxIndexLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsNonNullableColumns( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsNonNullableColumns( ) { return false; } -OUString SAL_CALL MacabDatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getCatalogTerm( ) { OUString aVal; if (m_bUseCatalog) @@ -203,25 +203,25 @@ OUString SAL_CALL MacabDatabaseMetaData::getCatalogTerm( ) throw(SQLException, return aVal; } -OUString SAL_CALL MacabDatabaseMetaData::getIdentifierQuoteString( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getIdentifierQuoteString( ) { // normally this is " OUString aVal("\""); return aVal; } -OUString SAL_CALL MacabDatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getExtraNameCharacters( ) { OUString aVal; return aVal; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsDifferentTableCorrelationNames( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsDifferentTableCorrelationNames( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::isCatalogAtStart( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::isCatalogAtStart( ) { bool bValue = false; if (m_bUseCatalog) @@ -230,326 +230,326 @@ sal_Bool SAL_CALL MacabDatabaseMetaData::isCatalogAtStart( ) throw(SQLException return bValue; } -sal_Bool SAL_CALL MacabDatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::dataDefinitionIgnoredInTransactions( ) { return true; } -sal_Bool SAL_CALL MacabDatabaseMetaData::dataDefinitionCausesTransactionCommit( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::dataDefinitionCausesTransactionCommit( ) { return true; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsDataManipulationTransactionsOnly( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsDataManipulationTransactionsOnly( ) { return true; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) { return true; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsPositionedDelete( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsPositionedDelete( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsPositionedUpdate( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsPositionedUpdate( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOpenStatementsAcrossRollback( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOpenStatementsAcrossRollback( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOpenStatementsAcrossCommit( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOpenStatementsAcrossCommit( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOpenCursorsAcrossCommit( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOpenCursorsAcrossCommit( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOpenCursorsAcrossRollback( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOpenCursorsAcrossRollback( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSchemasInDataManipulation( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSchemasInDataManipulation( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsANSI92FullSQL( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsANSI92FullSQL( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsANSI92EntryLevelSQL( ) { return true; // should be supported at least } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsIntegrityEnhancementFacility( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSchemasInIndexDefinitions( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSchemasInTableDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSchemasInTableDefinitions( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCatalogsInTableDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCatalogsInTableDefinitions( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCatalogsInIndexDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCatalogsInIndexDefinitions( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCatalogsInDataManipulation( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCatalogsInDataManipulation( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOuterJoins( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOuterJoins( ) { return false; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxStatements( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxStatements( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxProcedureNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxProcedureNameLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxSchemaNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxSchemaNameLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsTransactions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsTransactions( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::allProceduresAreCallable( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::allProceduresAreCallable( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsStoredProcedures( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsStoredProcedures( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSelectForUpdate( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSelectForUpdate( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::allTablesAreSelectable( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::allTablesAreSelectable( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::isReadOnly( ) { // for the moment, we have read-only addresses, but this might change in the future return true; } -sal_Bool SAL_CALL MacabDatabaseMetaData::usesLocalFiles( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::usesLocalFiles( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::usesLocalFilePerTable( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::usesLocalFilePerTable( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsTypeConversion( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsTypeConversion( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::nullPlusNonNullIsNull( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::nullPlusNonNullIsNull( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsColumnAliasing( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsColumnAliasing( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsTableCorrelationNames( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsTableCorrelationNames( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsConvert( sal_Int32, sal_Int32 ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsConvert( sal_Int32, sal_Int32 ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsExpressionsInOrderBy( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsExpressionsInOrderBy( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsGroupBy( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsGroupBy( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsGroupByBeyondSelect( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsGroupByBeyondSelect( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsGroupByUnrelated( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsGroupByUnrelated( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsMultipleTransactions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsMultipleTransactions( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsMultipleResultSets( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsMultipleResultSets( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsLikeEscapeClause( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsOrderByUnrelated( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsUnion( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsUnion( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsUnionAll( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsUnionAll( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsMixedCaseIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsMixedCaseIdentifiers( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsMixedCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsMixedCaseQuotedIdentifiers( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::nullsAreSortedAtEnd( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::nullsAreSortedAtStart( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::nullsAreSortedAtStart( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::nullsAreSortedHigh( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::nullsAreSortedHigh( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::nullsAreSortedLow( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::nullsAreSortedLow( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSchemasInProcedureCalls( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSchemasInProcedureCalls( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCatalogsInProcedureCalls( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCorrelatedSubqueries( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCorrelatedSubqueries( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSubqueriesInComparisons( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSubqueriesInComparisons( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSubqueriesInExists( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSubqueriesInExists( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSubqueriesInIns( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSubqueriesInIns( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsSubqueriesInQuantifieds( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsANSI92IntermediateSQL( ) { return false; } -OUString SAL_CALL MacabDatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getURL( ) { // if someday we support more than the default address book, // this method should return the URL which was used to create it @@ -557,145 +557,145 @@ OUString SAL_CALL MacabDatabaseMetaData::getURL( ) throw(SQLException, RuntimeE return aValue; } -OUString SAL_CALL MacabDatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getUserName( ) { OUString aValue; return aValue; } -OUString SAL_CALL MacabDatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getDriverName( ) { OUString aValue( "macab" ); return aValue; } -OUString SAL_CALL MacabDatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getDriverVersion() { OUString aValue(MACAB_DRIVER_VERSION); return aValue; } -OUString SAL_CALL MacabDatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getDatabaseProductVersion( ) { OUString aValue; return aValue; } -OUString SAL_CALL MacabDatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getDatabaseProductName( ) { OUString aValue; return aValue; } -OUString SAL_CALL MacabDatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getProcedureTerm( ) { OUString aValue; return aValue; } -OUString SAL_CALL MacabDatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getSchemaTerm( ) { OUString aValue; return aValue; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getDriverMajorVersion( ) { return MACAB_DRIVER_VERSION_MAJOR; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getDefaultTransactionIsolation( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getDefaultTransactionIsolation( ) { return TransactionIsolation::NONE; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getDriverMinorVersion( ) { return MACAB_DRIVER_VERSION_MINOR; } -OUString SAL_CALL MacabDatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getSQLKeywords( ) { OUString aValue; return aValue; } -OUString SAL_CALL MacabDatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getSearchStringEscape( ) { OUString aValue; return aValue; } -OUString SAL_CALL MacabDatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getStringFunctions( ) { return OUString(); } -OUString SAL_CALL MacabDatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getTimeDateFunctions( ) { return OUString(); } -OUString SAL_CALL MacabDatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getSystemFunctions( ) { return OUString(); } -OUString SAL_CALL MacabDatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabDatabaseMetaData::getNumericFunctions( ) { return OUString(); } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsExtendedSQLGrammar( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCoreSQLGrammar( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsCoreSQLGrammar( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsMinimumSQLGrammar( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsMinimumSQLGrammar( ) { return true; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsFullOuterJoins( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsFullOuterJoins( ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsLimitedOuterJoins( ) { return false; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnsInGroupBy( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnsInOrderBy( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxColumnsInSelect( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxUserNameLength( ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabDatabaseMetaData::getMaxUserNameLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsResultSetType( sal_Int32 setType ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsResultSetType( sal_Int32 setType ) { switch (setType) { @@ -706,7 +706,7 @@ sal_Bool SAL_CALL MacabDatabaseMetaData::supportsResultSetType( sal_Int32 setTyp return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 ) { switch (setType) { @@ -717,62 +717,62 @@ sal_Bool SAL_CALL MacabDatabaseMetaData::supportsResultSetConcurrency( sal_Int32 return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::ownUpdatesAreVisible( sal_Int32 ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::ownUpdatesAreVisible( sal_Int32 ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::ownDeletesAreVisible( sal_Int32 ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::ownDeletesAreVisible( sal_Int32 ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::ownInsertsAreVisible( sal_Int32 ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::ownInsertsAreVisible( sal_Int32 ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::othersUpdatesAreVisible( sal_Int32 ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::othersUpdatesAreVisible( sal_Int32 ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::othersDeletesAreVisible( sal_Int32 ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::othersDeletesAreVisible( sal_Int32 ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::othersInsertsAreVisible( sal_Int32 ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::othersInsertsAreVisible( sal_Int32 ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::updatesAreDetected( sal_Int32 ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::updatesAreDetected( sal_Int32 ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::deletesAreDetected( sal_Int32 ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::deletesAreDetected( sal_Int32 ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::insertsAreDetected( sal_Int32 ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::insertsAreDetected( sal_Int32 ) { return false; } -sal_Bool SAL_CALL MacabDatabaseMetaData::supportsBatchUpdates( ) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabDatabaseMetaData::supportsBatchUpdates( ) { return false; } -Reference< XConnection > SAL_CALL MacabDatabaseMetaData::getConnection( ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL MacabDatabaseMetaData::getConnection( ) { return m_xConnection.get(); } -Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTableTypes( ) { ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTableTypes); Reference< XResultSet > xRef = pResult; @@ -791,7 +791,7 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTableTypes( ) throw( return xRef; } -Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTypeInfo( ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTypeInfo( ) { ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTypeInfo); Reference< XResultSet > xRef = pResult; @@ -847,19 +847,19 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTypeInfo( ) throw(SQ return xRef; } -Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getCatalogs( ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getCatalogs( ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eCatalogs ); } -Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getSchemas( ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getSchemas( ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eSchemas ); } Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getColumnPrivileges( const Any&, const OUString&, const OUString&, - const OUString& ) throw(SQLException, RuntimeException) + const OUString& ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eColumnPrivileges ); } @@ -868,7 +868,7 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getColumns( const Any&, const OUString&, const OUString& tableNamePattern, - const OUString& columnNamePattern) throw(SQLException, RuntimeException) + const OUString& columnNamePattern) { ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eColumns); Reference< XResultSet > xRef = pResult; @@ -955,7 +955,7 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTables( const Any&, const OUString&, const OUString&, - const Sequence< OUString >& types) throw(SQLException, RuntimeException) + const Sequence< OUString >& types) { ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eTables); Reference< XResultSet > xRef = pResult; @@ -1015,20 +1015,20 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTables( Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getProcedureColumns( const Any&, const OUString&, - const OUString&, const OUString& ) throw(SQLException, RuntimeException) + const OUString&, const OUString& ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedureColumns ); } Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getProcedures( const Any&, const OUString&, - const OUString& ) throw(SQLException, RuntimeException) + const OUString& ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedures ); } Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getVersionColumns( - const Any&, const OUString&, const OUString& table ) throw(SQLException, RuntimeException) + const Any&, const OUString&, const OUString& table ) { ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eVersionColumns); Reference< XResultSet > xRef = pResult; @@ -1059,39 +1059,39 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getVersionColumns( } Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getExportedKeys( - const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException) + const Any&, const OUString&, const OUString& ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eExportedKeys ); } Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getImportedKeys( - const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException) + const Any&, const OUString&, const OUString& ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eImportedKeys ); } Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getPrimaryKeys( - const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException) + const Any&, const OUString&, const OUString& ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::ePrimaryKeys ); } Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getIndexInfo( const Any&, const OUString&, const OUString&, - sal_Bool, sal_Bool ) throw(SQLException, RuntimeException) + sal_Bool, sal_Bool ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eIndexInfo ); } Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getBestRowIdentifier( const Any&, const OUString&, const OUString&, sal_Int32, - sal_Bool ) throw(SQLException, RuntimeException) + sal_Bool ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eBestRowIdentifier ); } Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTablePrivileges( - const Any&, const OUString&, const OUString& ) throw(SQLException, RuntimeException) + const Any&, const OUString&, const OUString& ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eTablePrivileges ); } @@ -1099,12 +1099,12 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTablePrivileges( Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getCrossReference( const Any&, const OUString&, const OUString&, const Any&, - const OUString&, const OUString& ) throw(SQLException, RuntimeException) + const OUString&, const OUString& ) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eCrossReference ); } -Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getUDTs( const Any&, const OUString&, const OUString&, const Sequence< sal_Int32 >& ) throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getUDTs( const Any&, const OUString&, const OUString&, const Sequence< sal_Int32 >& ) { OSL_FAIL("Not implemented yet!"); throw SQLException(); diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx index 56eb1fd3498e..3ba29cca3fc3 100644 --- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx +++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx @@ -48,155 +48,155 @@ namespace connectivity // this interface is really BIG // XDatabaseMetaData - virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getURL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getUserName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isReadOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getDatabaseProductName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getDatabaseProductVersion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getDriverName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getDriverVersion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw(css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw(css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL usesLocalFiles( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getIdentifierQuoteString( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getSQLKeywords( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getNumericFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getStringFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getSystemFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getTimeDateFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getSearchStringEscape( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getExtraNameCharacters( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsTypeConversion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsGroupBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getSchemaTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getProcedureTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getCatalogTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isCatalogAtStart( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getCatalogSeparator( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsCatalogsInDataManipulation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsCatalogsInTableDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsPositionedDelete( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsStoredProcedures( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsUnion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsUnionAll( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxConnections( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxIndexLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxRowSize( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxStatementLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxStatements( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxTablesInSelect( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const css::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTypeInfo( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL allProceduresAreCallable( ) override; + virtual sal_Bool SAL_CALL allTablesAreSelectable( ) override; + virtual OUString SAL_CALL getURL( ) override; + virtual OUString SAL_CALL getUserName( ) override; + virtual sal_Bool SAL_CALL isReadOnly( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedLow( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) override; + virtual OUString SAL_CALL getDatabaseProductName( ) override; + virtual OUString SAL_CALL getDatabaseProductVersion( ) override; + virtual OUString SAL_CALL getDriverName( ) override; + virtual OUString SAL_CALL getDriverVersion( ) override; + virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) override; + virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) override; + virtual sal_Bool SAL_CALL usesLocalFiles( ) override; + virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) override; + virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL supportsMixedCaseQuotedIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesMixedCaseQuotedIdentifiers( ) override; + virtual OUString SAL_CALL getIdentifierQuoteString( ) override; + virtual OUString SAL_CALL getSQLKeywords( ) override; + virtual OUString SAL_CALL getNumericFunctions( ) override; + virtual OUString SAL_CALL getStringFunctions( ) override; + virtual OUString SAL_CALL getSystemFunctions( ) override; + virtual OUString SAL_CALL getTimeDateFunctions( ) override; + virtual OUString SAL_CALL getSearchStringEscape( ) override; + virtual OUString SAL_CALL getExtraNameCharacters( ) override; + virtual sal_Bool SAL_CALL supportsAlterTableWithAddColumn( ) override; + virtual sal_Bool SAL_CALL supportsAlterTableWithDropColumn( ) override; + virtual sal_Bool SAL_CALL supportsColumnAliasing( ) override; + virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) override; + virtual sal_Bool SAL_CALL supportsTypeConversion( ) override; + virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) override; + virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) override; + virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) override; + virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) override; + virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) override; + virtual sal_Bool SAL_CALL supportsGroupBy( ) override; + virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) override; + virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) override; + virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) override; + virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) override; + virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) override; + virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) override; + virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) override; + virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) override; + virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) override; + virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) override; + virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) override; + virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) override; + virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) override; + virtual sal_Bool SAL_CALL supportsOuterJoins( ) override; + virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) override; + virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) override; + virtual OUString SAL_CALL getSchemaTerm( ) override; + virtual OUString SAL_CALL getProcedureTerm( ) override; + virtual OUString SAL_CALL getCatalogTerm( ) override; + virtual sal_Bool SAL_CALL isCatalogAtStart( ) override; + virtual OUString SAL_CALL getCatalogSeparator( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInDataManipulation( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInTableDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInDataManipulation( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInTableDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsPositionedDelete( ) override; + virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) override; + virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) override; + virtual sal_Bool SAL_CALL supportsStoredProcedures( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) override; + virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) override; + virtual sal_Bool SAL_CALL supportsUnion( ) override; + virtual sal_Bool SAL_CALL supportsUnionAll( ) override; + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) override; + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) override; + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) override; + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) override; + virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) override; + virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) override; + virtual sal_Int32 SAL_CALL getMaxConnections( ) override; + virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxIndexLength( ) override; + virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxRowSize( ) override; + virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) override; + virtual sal_Int32 SAL_CALL getMaxStatementLength( ) override; + virtual sal_Int32 SAL_CALL getMaxStatements( ) override; + virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxTablesInSelect( ) override; + virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) override; + virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) override; + virtual sal_Bool SAL_CALL supportsTransactions( ) override; + virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) override; + virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) override; + virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) override; + virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) override; + virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedures( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getProcedureColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern, const OUString& columnNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getSchemas( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCatalogs( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumnPrivileges( const css::uno::Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getBestRowIdentifier( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, sal_Bool nullable ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getVersionColumns( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getPrimaryKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getImportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getExportedKeys( const css::uno::Any& catalog, const OUString& schema, const OUString& table ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getCrossReference( const css::uno::Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const css::uno::Any& foreignCatalog, const OUString& foreignSchema, const OUString& foreignTable ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTypeInfo( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getIndexInfo( const css::uno::Any& catalog, const OUString& schema, const OUString& table, sal_Bool unique, sal_Bool approximate ) override; + virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) override; + virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL supportsBatchUpdates( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) override; }; } } diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx b/connectivity/source/drivers/macab/MacabDriver.cxx index 8fe1333ea8a7..3b64c4c5c1e3 100644 --- a/connectivity/source/drivers/macab/MacabDriver.cxx +++ b/connectivity/source/drivers/macab/MacabDriver.cxx @@ -215,12 +215,12 @@ void MacabDriver::disposing() } // static ServiceInfo -OUString MacabDriver::getImplementationName_Static( ) throw(RuntimeException) +OUString MacabDriver::getImplementationName_Static( ) { return OUString("com.sun.star.comp.sdbc.macab.Driver"); } -Sequence< OUString > MacabDriver::getSupportedServiceNames_Static( ) throw (RuntimeException) +Sequence< OUString > MacabDriver::getSupportedServiceNames_Static( ) { // which service is supported // for more information @see com.sun.star.sdbc.Driver @@ -229,22 +229,22 @@ Sequence< OUString > MacabDriver::getSupportedServiceNames_Static( ) throw (Run return aSNS; } -OUString SAL_CALL MacabDriver::getImplementationName( ) throw(RuntimeException) +OUString SAL_CALL MacabDriver::getImplementationName( ) { return getImplementationName_Static(); } -sal_Bool SAL_CALL MacabDriver::supportsService( const OUString& _rServiceName ) throw(RuntimeException) +sal_Bool SAL_CALL MacabDriver::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } -Sequence< OUString > SAL_CALL MacabDriver::getSupportedServiceNames( ) throw(RuntimeException) +Sequence< OUString > SAL_CALL MacabDriver::getSupportedServiceNames( ) { return getSupportedServiceNames_Static(); } -Reference< XConnection > SAL_CALL MacabDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL MacabDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) { ::osl::MutexGuard aGuard(m_aMutex); @@ -268,7 +268,6 @@ Reference< XConnection > SAL_CALL MacabDriver::connect( const OUString& url, con } sal_Bool SAL_CALL MacabDriver::acceptsURL( const OUString& url ) - throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); @@ -279,33 +278,33 @@ sal_Bool SAL_CALL MacabDriver::acceptsURL( const OUString& url ) return url == "sdbc:address:macab"; } -Sequence< DriverPropertyInfo > SAL_CALL MacabDriver::getPropertyInfo( const OUString&, const Sequence< PropertyValue >& ) throw(SQLException, RuntimeException) +Sequence< DriverPropertyInfo > SAL_CALL MacabDriver::getPropertyInfo( const OUString&, const Sequence< PropertyValue >& ) { // if you have something special to say, return it here :-) return Sequence< DriverPropertyInfo >(); } -sal_Int32 SAL_CALL MacabDriver::getMajorVersion( ) throw(RuntimeException) +sal_Int32 SAL_CALL MacabDriver::getMajorVersion( ) { return MACAB_DRIVER_VERSION_MAJOR; } -sal_Int32 SAL_CALL MacabDriver::getMinorVersion( ) throw(RuntimeException) +sal_Int32 SAL_CALL MacabDriver::getMinorVersion( ) { return MACAB_DRIVER_VERSION_MINOR; } -void SAL_CALL MacabDriver::queryTermination( const EventObject& ) throw (TerminationVetoException, RuntimeException) +void SAL_CALL MacabDriver::queryTermination( const EventObject& ) { // nothing to do, nothing to veto } -void SAL_CALL MacabDriver::notifyTermination( const EventObject& ) throw (RuntimeException) +void SAL_CALL MacabDriver::notifyTermination( const EventObject& ) { m_aImplModule.shutdown(); } -void SAL_CALL MacabDriver::disposing( const EventObject& ) throw (RuntimeException) +void SAL_CALL MacabDriver::disposing( const EventObject& ) { // not interested in (this is the disposing of the desktop, if any) } @@ -318,7 +317,7 @@ OUString MacabDriver::impl_getConfigurationSettingsPath() return aPath.makeStringAndClear(); } -Reference< XInterface > SAL_CALL MacabDriver::Create( const Reference< XMultiServiceFactory >& _rxFactory ) throw( Exception ) +Reference< XInterface > SAL_CALL MacabDriver::Create( const Reference< XMultiServiceFactory >& _rxFactory ) { return *(new MacabDriver(comphelper::getComponentContext(_rxFactory))); } diff --git a/connectivity/source/drivers/macab/MacabDriver.hxx b/connectivity/source/drivers/macab/MacabDriver.hxx index e150afcac2e4..71e8c88f6a2c 100644 --- a/connectivity/source/drivers/macab/MacabDriver.hxx +++ b/connectivity/source/drivers/macab/MacabDriver.hxx @@ -119,13 +119,13 @@ namespace connectivity public: /// @throws css::uno::Exception - static css::uno::Reference< css::uno::XInterface > SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception ); + static css::uno::Reference< css::uno::XInterface > SAL_CALL Create(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory); // XServiceInfo - static versions /// @throws css::uno::RuntimeException - static OUString getImplementationName_Static( ) throw(css::uno::RuntimeException); + static OUString getImplementationName_Static( ); /// @throws css::uno::RuntimeException - static css::uno::Sequence< OUString > getSupportedServiceNames_Static( ) throw (css::uno::RuntimeException); + static css::uno::Sequence< OUString > getSupportedServiceNames_Static( ); css::uno::Reference< css::uno::XComponentContext > const & getComponentContext() const { return m_xContext; } @@ -141,23 +141,23 @@ namespace connectivity virtual void SAL_CALL disposing() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XDriver - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMajorVersion() throw(css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getMinorVersion() throw(css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override; + virtual sal_Bool SAL_CALL acceptsURL( const OUString& url ) override; + virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const OUString& url, const css::uno::Sequence< css::beans::PropertyValue >& info ) override; + virtual sal_Int32 SAL_CALL getMajorVersion() override; + virtual sal_Int32 SAL_CALL getMinorVersion() override; // XTerminateListener - virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) throw (css::frame::TerminationVetoException, css::uno::RuntimeException) override; - virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) throw (css::uno::RuntimeException) override; + virtual void SAL_CALL queryTermination( const css::lang::EventObject& Event ) override; + virtual void SAL_CALL notifyTermination( const css::lang::EventObject& Event ) override; // XEventListener - virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw (css::uno::RuntimeException) override; + virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) override; private: /** shuts down the library which contains the real implementations diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx index 2b4cbd01271a..e7e770d2a8fe 100644 --- a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx +++ b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx @@ -34,7 +34,7 @@ using namespace com::sun::star::util; IMPLEMENT_SERVICE_INFO(MacabPreparedStatement, "com.sun.star.sdbc.drivers.MacabPreparedStatement", "com.sun.star.sdbc.PreparedStatement"); -void MacabPreparedStatement::checkAndResizeParameters(sal_Int32 nParams) throw(SQLException) +void MacabPreparedStatement::checkAndResizeParameters(sal_Int32 nParams) { if ( !m_aParameterRow.is() ) m_aParameterRow = new OValueVector(); @@ -46,7 +46,7 @@ void MacabPreparedStatement::checkAndResizeParameters(sal_Int32 nParams) throw(S (m_aParameterRow->get()).resize(nParams); } -void MacabPreparedStatement::setMacabFields() const throw(SQLException) +void MacabPreparedStatement::setMacabFields() const { ::rtl::Reference xColumns; // selected columns @@ -62,12 +62,12 @@ void MacabPreparedStatement::setMacabFields() const throw(SQLException) m_xMetaData->setMacabFields(xColumns); } -void MacabPreparedStatement::resetParameters() const throw(SQLException) +void MacabPreparedStatement::resetParameters() const { m_nParameterIndex = 0; } -void MacabPreparedStatement::getNextParameter(OUString &rParameter) const throw(SQLException) +void MacabPreparedStatement::getNextParameter(OUString &rParameter) const { if (m_nParameterIndex >= (sal_Int32) (m_aParameterRow->get()).size()) { @@ -110,7 +110,7 @@ void MacabPreparedStatement::disposing() } } -Reference< XResultSetMetaData > SAL_CALL MacabPreparedStatement::getMetaData() throw(SQLException, RuntimeException) +Reference< XResultSetMetaData > SAL_CALL MacabPreparedStatement::getMetaData() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); @@ -135,7 +135,7 @@ Reference< XResultSetMetaData > SAL_CALL MacabPreparedStatement::getMetaData() t return xMetaData; } -void SAL_CALL MacabPreparedStatement::close() throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::close() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); @@ -153,7 +153,7 @@ void SAL_CALL MacabPreparedStatement::close() throw(SQLException, RuntimeExcepti // list } -sal_Bool SAL_CALL MacabPreparedStatement::execute() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabPreparedStatement::execute() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); @@ -163,7 +163,7 @@ sal_Bool SAL_CALL MacabPreparedStatement::execute() throw(SQLException, RuntimeE return xRS.is(); } -sal_Int32 SAL_CALL MacabPreparedStatement::executeUpdate() throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabPreparedStatement::executeUpdate() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); @@ -172,7 +172,7 @@ sal_Int32 SAL_CALL MacabPreparedStatement::executeUpdate() throw(SQLException, R return 0; } -Reference< XConnection > SAL_CALL MacabPreparedStatement::getConnection() throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL MacabPreparedStatement::getConnection() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); @@ -180,7 +180,7 @@ Reference< XConnection > SAL_CALL MacabPreparedStatement::getConnection() throw( return m_pConnection; } -Reference< XResultSet > SAL_CALL MacabPreparedStatement::executeQuery() throw(SQLException, RuntimeException) +Reference< XResultSet > SAL_CALL MacabPreparedStatement::executeQuery() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); @@ -190,7 +190,7 @@ Reference< XResultSet > SAL_CALL MacabPreparedStatement::executeQuery() throw(SQ return rs; } -void SAL_CALL MacabPreparedStatement::setNull(sal_Int32 parameterIndex, sal_Int32) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setNull(sal_Int32 parameterIndex, sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); @@ -200,47 +200,47 @@ void SAL_CALL MacabPreparedStatement::setNull(sal_Int32 parameterIndex, sal_Int3 (m_aParameterRow->get())[parameterIndex - 1].setNull(); } -void SAL_CALL MacabPreparedStatement::setObjectNull(sal_Int32, sal_Int32, const OUString&) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setObjectNull(sal_Int32, sal_Int32, const OUString&) { ::dbtools::throwFunctionNotSupportedSQLException("setObjectNull", nullptr); } -void SAL_CALL MacabPreparedStatement::setBoolean(sal_Int32, sal_Bool) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setBoolean(sal_Int32, sal_Bool) { ::dbtools::throwFunctionNotSupportedSQLException("setBoolean", nullptr); } -void SAL_CALL MacabPreparedStatement::setByte(sal_Int32, sal_Int8) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setByte(sal_Int32, sal_Int8) { ::dbtools::throwFunctionNotSupportedSQLException("setByte", nullptr); } -void SAL_CALL MacabPreparedStatement::setShort(sal_Int32, sal_Int16) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setShort(sal_Int32, sal_Int16) { ::dbtools::throwFunctionNotSupportedSQLException("setShort", nullptr); } -void SAL_CALL MacabPreparedStatement::setInt(sal_Int32, sal_Int32) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setInt(sal_Int32, sal_Int32) { ::dbtools::throwFunctionNotSupportedSQLException("setInt", nullptr); } -void SAL_CALL MacabPreparedStatement::setLong(sal_Int32, sal_Int64) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setLong(sal_Int32, sal_Int64) { ::dbtools::throwFunctionNotSupportedSQLException("setLong", nullptr); } -void SAL_CALL MacabPreparedStatement::setFloat(sal_Int32, float) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setFloat(sal_Int32, float) { ::dbtools::throwFunctionNotSupportedSQLException("setFloat", nullptr); } -void SAL_CALL MacabPreparedStatement::setDouble(sal_Int32, double) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setDouble(sal_Int32, double) { ::dbtools::throwFunctionNotSupportedSQLException("setDouble", nullptr); } -void SAL_CALL MacabPreparedStatement::setString(sal_Int32 parameterIndex, const OUString &x) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setString(sal_Int32 parameterIndex, const OUString &x) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); @@ -250,38 +250,38 @@ void SAL_CALL MacabPreparedStatement::setString(sal_Int32 parameterIndex, const (m_aParameterRow->get())[parameterIndex - 1] = x; } -void SAL_CALL MacabPreparedStatement::setBytes(sal_Int32, const Sequence< sal_Int8 >&) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setBytes(sal_Int32, const Sequence< sal_Int8 >&) { ::dbtools::throwFunctionNotSupportedSQLException("setBytes", nullptr); } -void SAL_CALL MacabPreparedStatement::setDate(sal_Int32, const Date&) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setDate(sal_Int32, const Date&) { ::dbtools::throwFunctionNotSupportedSQLException("setDate", nullptr); } -void SAL_CALL MacabPreparedStatement::setTime(sal_Int32, const css::util::Time&) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setTime(sal_Int32, const css::util::Time&) { ::dbtools::throwFunctionNotSupportedSQLException("setTime", nullptr); } -void SAL_CALL MacabPreparedStatement::setTimestamp(sal_Int32, const DateTime&) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setTimestamp(sal_Int32, const DateTime&) { ::dbtools::throwFunctionNotSupportedSQLException("setTimestamp", nullptr); } -void SAL_CALL MacabPreparedStatement::setBinaryStream(sal_Int32, const Reference< css::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setBinaryStream(sal_Int32, const Reference< css::io::XInputStream >&, sal_Int32) { ::dbtools::throwFunctionNotSupportedSQLException("setBinaryStream", nullptr); } -void SAL_CALL MacabPreparedStatement::setCharacterStream(sal_Int32, const Reference< css::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setCharacterStream(sal_Int32, const Reference< css::io::XInputStream >&, sal_Int32) { ::dbtools::throwFunctionNotSupportedSQLException("setCharacterStream", nullptr); } -void SAL_CALL MacabPreparedStatement::setObject(sal_Int32 parameterIndex, const Any& x) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setObject(sal_Int32 parameterIndex, const Any& x) { if(!::dbtools::implSetObject(this,parameterIndex,x)) { @@ -293,37 +293,37 @@ void SAL_CALL MacabPreparedStatement::setObject(sal_Int32 parameterIndex, const } } -void SAL_CALL MacabPreparedStatement::setObjectWithInfo(sal_Int32, const Any&, sal_Int32, sal_Int32) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setObjectWithInfo(sal_Int32, const Any&, sal_Int32, sal_Int32) { ::dbtools::throwFunctionNotSupportedSQLException("setObjectWithInfo", nullptr); } -void SAL_CALL MacabPreparedStatement::setRef(sal_Int32, const Reference< XRef >&) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setRef(sal_Int32, const Reference< XRef >&) { ::dbtools::throwFunctionNotSupportedSQLException("setRef", nullptr); } -void SAL_CALL MacabPreparedStatement::setBlob(sal_Int32, const Reference< XBlob >&) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setBlob(sal_Int32, const Reference< XBlob >&) { ::dbtools::throwFunctionNotSupportedSQLException("setBlob", nullptr); } -void SAL_CALL MacabPreparedStatement::setClob(sal_Int32, const Reference< XClob >&) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setClob(sal_Int32, const Reference< XClob >&) { ::dbtools::throwFunctionNotSupportedSQLException("setClob", nullptr); } -void SAL_CALL MacabPreparedStatement::setArray(sal_Int32, const Reference< XArray >&) throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::setArray(sal_Int32, const Reference< XArray >&) { ::dbtools::throwFunctionNotSupportedSQLException("setArray", nullptr); } -void SAL_CALL MacabPreparedStatement::clearParameters() throw(SQLException, RuntimeException) +void SAL_CALL MacabPreparedStatement::clearParameters() { ::dbtools::throwFunctionNotSupportedSQLException("clearParameters", nullptr); } -void MacabPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception) +void MacabPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) { switch (nHandle) { diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.hxx b/connectivity/source/drivers/macab/MacabPreparedStatement.hxx index 312326edef23..a37c1b29a8a4 100644 --- a/connectivity/source/drivers/macab/MacabPreparedStatement.hxx +++ b/connectivity/source/drivers/macab/MacabPreparedStatement.hxx @@ -48,17 +48,17 @@ namespace connectivity OValueRow m_aParameterRow; /// @throws css::sdbc::SQLException - void checkAndResizeParameters(sal_Int32 nParams) throw(css::sdbc::SQLException); + void checkAndResizeParameters(sal_Int32 nParams); /// @throws css::sdbc::SQLException - void setMacabFields() const throw(css::sdbc::SQLException); + void setMacabFields() const; protected: virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const css::uno::Any& rValue) throw (css::uno::Exception) override; + const css::uno::Any& rValue) override; - virtual void resetParameters() const throw(css::sdbc::SQLException) override; - virtual void getNextParameter(OUString &rParameter) const throw(css::sdbc::SQLException) override; + virtual void resetParameters() const override; + virtual void getNextParameter(OUString &rParameter) const override; virtual ~MacabPreparedStatement() override; public: @@ -73,41 +73,41 @@ namespace connectivity using MacabCommonStatement::executeUpdate; using MacabCommonStatement::execute; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL executeUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL execute( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( ) override; + virtual sal_Int32 SAL_CALL executeUpdate( ) override; + virtual sal_Bool SAL_CALL execute( ) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) override; // XParameters - virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL clearParameters( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) override; + virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) override; + virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) override; + virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) override; + virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) override; + virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) override; + virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) override; + virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) override; + virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) override; + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) override; + virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) override; + virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) override; + virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) override; + virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) override; + virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) override; + virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) override; + virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) override; + virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) override; + virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) override; + virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) override; + virtual void SAL_CALL clearParameters( ) override; // XCloseable - virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL close( ) override; // XResultSetMetaDataSupplier - virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) override; }; } } diff --git a/connectivity/source/drivers/macab/MacabResultSet.cxx b/connectivity/source/drivers/macab/MacabResultSet.cxx index e0e09aea6a9d..505208f1b6f6 100644 --- a/connectivity/source/drivers/macab/MacabResultSet.cxx +++ b/connectivity/source/drivers/macab/MacabResultSet.cxx @@ -147,7 +147,7 @@ m_xStatement.clear(); m_xMetaData.clear(); } -Any SAL_CALL MacabResultSet::queryInterface(const Type & rType) throw(RuntimeException) +Any SAL_CALL MacabResultSet::queryInterface(const Type & rType) { Any aRet = OPropertySetHelper::queryInterface(rType); if (!aRet.hasValue()) @@ -165,7 +165,7 @@ void SAL_CALL MacabResultSet::release() throw() MacabResultSet_BASE::release(); } -Sequence< Type > SAL_CALL MacabResultSet::getTypes() throw(RuntimeException) +Sequence< Type > SAL_CALL MacabResultSet::getTypes() { OTypeCollection aTypes( cppu::UnoType::get(), @@ -175,12 +175,12 @@ Sequence< Type > SAL_CALL MacabResultSet::getTypes() throw(RuntimeException) return comphelper::concatSequences(aTypes.getTypes(), MacabResultSet_BASE::getTypes()); } -css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL MacabResultSet::getPropertySetInfo( ) throw(css::uno::RuntimeException) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL MacabResultSet::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } -sal_Int32 SAL_CALL MacabResultSet::findColumn(const OUString& columnName) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabResultSet::findColumn(const OUString& columnName) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -202,7 +202,7 @@ sal_Int32 SAL_CALL MacabResultSet::findColumn(const OUString& columnName) throw( return 0; // Never reached } -OUString SAL_CALL MacabResultSet::getString(sal_Int32 columnIndex) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabResultSet::getString(sal_Int32 columnIndex) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -229,7 +229,7 @@ OUString SAL_CALL MacabResultSet::getString(sal_Int32 columnIndex) throw(SQLExce return aRet; } -sal_Bool SAL_CALL MacabResultSet::getBoolean(sal_Int32) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSet::getBoolean(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -239,7 +239,7 @@ sal_Bool SAL_CALL MacabResultSet::getBoolean(sal_Int32) throw(SQLException, Runt return false; } -sal_Int8 SAL_CALL MacabResultSet::getByte(sal_Int32) throw(SQLException, RuntimeException) +sal_Int8 SAL_CALL MacabResultSet::getByte(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -250,7 +250,7 @@ sal_Int8 SAL_CALL MacabResultSet::getByte(sal_Int32) throw(SQLException, Runtime return nRet; } -sal_Int16 SAL_CALL MacabResultSet::getShort(sal_Int32) throw(SQLException, RuntimeException) +sal_Int16 SAL_CALL MacabResultSet::getShort(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -261,7 +261,7 @@ sal_Int16 SAL_CALL MacabResultSet::getShort(sal_Int32) throw(SQLException, Runti return nRet; } -sal_Int32 SAL_CALL MacabResultSet::getInt(sal_Int32 columnIndex) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabResultSet::getInt(sal_Int32 columnIndex) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -290,7 +290,7 @@ sal_Int32 SAL_CALL MacabResultSet::getInt(sal_Int32 columnIndex) throw(SQLExcept return nRet; } -sal_Int64 SAL_CALL MacabResultSet::getLong(sal_Int32 columnIndex) throw(SQLException, RuntimeException) +sal_Int64 SAL_CALL MacabResultSet::getLong(sal_Int32 columnIndex) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -319,7 +319,7 @@ sal_Int64 SAL_CALL MacabResultSet::getLong(sal_Int32 columnIndex) throw(SQLExcep return nRet; } -float SAL_CALL MacabResultSet::getFloat(sal_Int32 columnIndex) throw(SQLException, RuntimeException) +float SAL_CALL MacabResultSet::getFloat(sal_Int32 columnIndex) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -348,7 +348,7 @@ float SAL_CALL MacabResultSet::getFloat(sal_Int32 columnIndex) throw(SQLExceptio return nVal; } -double SAL_CALL MacabResultSet::getDouble(sal_Int32 columnIndex) throw(SQLException, RuntimeException) +double SAL_CALL MacabResultSet::getDouble(sal_Int32 columnIndex) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -377,7 +377,7 @@ double SAL_CALL MacabResultSet::getDouble(sal_Int32 columnIndex) throw(SQLExcept return nVal; } -Sequence< sal_Int8 > SAL_CALL MacabResultSet::getBytes(sal_Int32) throw(SQLException, RuntimeException) +Sequence< sal_Int8 > SAL_CALL MacabResultSet::getBytes(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -387,7 +387,7 @@ Sequence< sal_Int8 > SAL_CALL MacabResultSet::getBytes(sal_Int32) throw(SQLExcep return Sequence< sal_Int8 >(); } -Date SAL_CALL MacabResultSet::getDate(sal_Int32) throw(SQLException, RuntimeException) +Date SAL_CALL MacabResultSet::getDate(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -398,7 +398,7 @@ Date SAL_CALL MacabResultSet::getDate(sal_Int32) throw(SQLException, RuntimeExce return aRet; } -Time SAL_CALL MacabResultSet::getTime(sal_Int32) throw(SQLException, RuntimeException) +Time SAL_CALL MacabResultSet::getTime(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -409,7 +409,7 @@ Time SAL_CALL MacabResultSet::getTime(sal_Int32) throw(SQLException, RuntimeExce return nRet; } -DateTime SAL_CALL MacabResultSet::getTimestamp(sal_Int32 columnIndex) throw(SQLException, RuntimeException) +DateTime SAL_CALL MacabResultSet::getTimestamp(sal_Int32 columnIndex) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -436,7 +436,7 @@ DateTime SAL_CALL MacabResultSet::getTimestamp(sal_Int32 columnIndex) throw(SQLE return nRet; } -Reference< XInputStream > SAL_CALL MacabResultSet::getBinaryStream(sal_Int32) throw(SQLException, RuntimeException) +Reference< XInputStream > SAL_CALL MacabResultSet::getBinaryStream(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -446,7 +446,7 @@ Reference< XInputStream > SAL_CALL MacabResultSet::getBinaryStream(sal_Int32) th return nullptr; } -Reference< XInputStream > SAL_CALL MacabResultSet::getCharacterStream(sal_Int32) throw(SQLException, RuntimeException) +Reference< XInputStream > SAL_CALL MacabResultSet::getCharacterStream(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -456,7 +456,7 @@ Reference< XInputStream > SAL_CALL MacabResultSet::getCharacterStream(sal_Int32) return nullptr; } -Any SAL_CALL MacabResultSet::getObject(sal_Int32, const Reference< css::container::XNameAccess >&) throw(SQLException, RuntimeException) +Any SAL_CALL MacabResultSet::getObject(sal_Int32, const Reference< css::container::XNameAccess >&) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -466,7 +466,7 @@ Any SAL_CALL MacabResultSet::getObject(sal_Int32, const Reference< css::containe return Any(); } -Reference< XRef > SAL_CALL MacabResultSet::getRef(sal_Int32) throw(SQLException, RuntimeException) +Reference< XRef > SAL_CALL MacabResultSet::getRef(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -476,7 +476,7 @@ Reference< XRef > SAL_CALL MacabResultSet::getRef(sal_Int32) throw(SQLException, return nullptr; } -Reference< XBlob > SAL_CALL MacabResultSet::getBlob(sal_Int32) throw(SQLException, RuntimeException) +Reference< XBlob > SAL_CALL MacabResultSet::getBlob(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -486,7 +486,7 @@ Reference< XBlob > SAL_CALL MacabResultSet::getBlob(sal_Int32) throw(SQLExceptio return nullptr; } -Reference< XClob > SAL_CALL MacabResultSet::getClob(sal_Int32) throw(SQLException, RuntimeException) +Reference< XClob > SAL_CALL MacabResultSet::getClob(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -496,7 +496,7 @@ Reference< XClob > SAL_CALL MacabResultSet::getClob(sal_Int32) throw(SQLExceptio return nullptr; } -Reference< XArray > SAL_CALL MacabResultSet::getArray(sal_Int32) throw(SQLException, RuntimeException) +Reference< XArray > SAL_CALL MacabResultSet::getArray(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -506,7 +506,7 @@ Reference< XArray > SAL_CALL MacabResultSet::getArray(sal_Int32) throw(SQLExcept return nullptr; } -Reference< XResultSetMetaData > SAL_CALL MacabResultSet::getMetaData() throw(SQLException, RuntimeException) +Reference< XResultSetMetaData > SAL_CALL MacabResultSet::getMetaData() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -518,7 +518,7 @@ Reference< XResultSetMetaData > SAL_CALL MacabResultSet::getMetaData() throw(SQL return xMetaData; } -sal_Bool SAL_CALL MacabResultSet::isBeforeFirst() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSet::isBeforeFirst() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -529,7 +529,7 @@ sal_Bool SAL_CALL MacabResultSet::isBeforeFirst() throw(SQLException, RuntimeExc return false; } -sal_Bool SAL_CALL MacabResultSet::isAfterLast() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSet::isAfterLast() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -541,7 +541,7 @@ sal_Bool SAL_CALL MacabResultSet::isAfterLast() throw(SQLException, RuntimeExcep return false; } -sal_Bool SAL_CALL MacabResultSet::isFirst() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSet::isFirst() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -552,7 +552,7 @@ sal_Bool SAL_CALL MacabResultSet::isFirst() throw(SQLException, RuntimeException return false; } -sal_Bool SAL_CALL MacabResultSet::isLast() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSet::isLast() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -564,7 +564,7 @@ sal_Bool SAL_CALL MacabResultSet::isLast() throw(SQLException, RuntimeException) return false; } -void SAL_CALL MacabResultSet::beforeFirst() throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::beforeFirst() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -573,7 +573,7 @@ void SAL_CALL MacabResultSet::beforeFirst() throw(SQLException, RuntimeException m_nRowPos = -1; } -void SAL_CALL MacabResultSet::afterLast() throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::afterLast() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -583,7 +583,7 @@ void SAL_CALL MacabResultSet::afterLast() throw(SQLException, RuntimeException) m_nRowPos = nRecords; } -void SAL_CALL MacabResultSet::close() throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::close() { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -592,7 +592,7 @@ void SAL_CALL MacabResultSet::close() throw(SQLException, RuntimeException) dispose(); } -sal_Bool SAL_CALL MacabResultSet::first() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSet::first() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -605,7 +605,7 @@ sal_Bool SAL_CALL MacabResultSet::first() throw(SQLException, RuntimeException) return true; } -sal_Bool SAL_CALL MacabResultSet::last() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSet::last() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -618,7 +618,7 @@ sal_Bool SAL_CALL MacabResultSet::last() throw(SQLException, RuntimeException) return true; } -sal_Int32 SAL_CALL MacabResultSet::getRow() throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabResultSet::getRow() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -626,7 +626,7 @@ sal_Int32 SAL_CALL MacabResultSet::getRow() throw(SQLException, RuntimeException return m_nRowPos; } -sal_Bool SAL_CALL MacabResultSet::absolute(sal_Int32 row) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSet::absolute(sal_Int32 row) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -640,7 +640,7 @@ sal_Bool SAL_CALL MacabResultSet::absolute(sal_Int32 row) throw(SQLException, Ru return true; } -sal_Bool SAL_CALL MacabResultSet::relative(sal_Int32 row) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSet::relative(sal_Int32 row) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -648,7 +648,7 @@ sal_Bool SAL_CALL MacabResultSet::relative(sal_Int32 row) throw(SQLException, Ru return absolute(m_nRowPos + row); } -sal_Bool SAL_CALL MacabResultSet::next() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSet::next() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -656,7 +656,7 @@ sal_Bool SAL_CALL MacabResultSet::next() throw(SQLException, RuntimeException) return absolute(m_nRowPos + 1); } -sal_Bool SAL_CALL MacabResultSet::previous() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSet::previous() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -664,7 +664,7 @@ sal_Bool SAL_CALL MacabResultSet::previous() throw(SQLException, RuntimeExceptio return absolute(m_nRowPos - 1); } -Reference< XInterface > SAL_CALL MacabResultSet::getStatement() throw(SQLException, RuntimeException) +Reference< XInterface > SAL_CALL MacabResultSet::getStatement() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -673,7 +673,7 @@ Reference< XInterface > SAL_CALL MacabResultSet::getStatement() throw(SQLExcepti return xStatement; } -sal_Bool SAL_CALL MacabResultSet::rowDeleted() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSet::rowDeleted() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -681,7 +681,7 @@ sal_Bool SAL_CALL MacabResultSet::rowDeleted() throw(SQLException, RuntimeExcept return false; } -sal_Bool SAL_CALL MacabResultSet::rowInserted() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSet::rowInserted() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -689,7 +689,7 @@ sal_Bool SAL_CALL MacabResultSet::rowInserted() throw(SQLException, RuntimeExcep return false; } -sal_Bool SAL_CALL MacabResultSet::rowUpdated() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSet::rowUpdated() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -697,7 +697,7 @@ sal_Bool SAL_CALL MacabResultSet::rowUpdated() throw(SQLException, RuntimeExcept return false; } -sal_Bool SAL_CALL MacabResultSet::wasNull() throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSet::wasNull() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -705,22 +705,22 @@ sal_Bool SAL_CALL MacabResultSet::wasNull() throw(SQLException, RuntimeException return m_bWasNull; } -void SAL_CALL MacabResultSet::cancel() throw(RuntimeException) +void SAL_CALL MacabResultSet::cancel() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL MacabResultSet::clearWarnings() throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::clearWarnings() { } -Any SAL_CALL MacabResultSet::getWarnings() throw(SQLException, RuntimeException) +Any SAL_CALL MacabResultSet::getWarnings() { return Any(); } -void SAL_CALL MacabResultSet::insertRow() throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::insertRow() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -728,7 +728,7 @@ void SAL_CALL MacabResultSet::insertRow() throw(SQLException, RuntimeException) // you only have to implement this if you want to insert new rows } -void SAL_CALL MacabResultSet::updateRow() throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::updateRow() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -736,19 +736,19 @@ void SAL_CALL MacabResultSet::updateRow() throw(SQLException, RuntimeException) // only when you allow updates } -void SAL_CALL MacabResultSet::deleteRow() throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::deleteRow() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL MacabResultSet::cancelRowUpdates() throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::cancelRowUpdates() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL MacabResultSet::moveToInsertRow() throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::moveToInsertRow() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -756,122 +756,122 @@ void SAL_CALL MacabResultSet::moveToInsertRow() throw(SQLException, RuntimeExcep // only when you allow inserts } -void SAL_CALL MacabResultSet::moveToCurrentRow() throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::moveToCurrentRow() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL MacabResultSet::updateNull(sal_Int32) throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::updateNull(sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL MacabResultSet::updateBoolean(sal_Int32, sal_Bool) throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::updateBoolean(sal_Int32, sal_Bool) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL MacabResultSet::updateByte(sal_Int32, sal_Int8) throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::updateByte(sal_Int32, sal_Int8) { checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); } -void SAL_CALL MacabResultSet::updateShort(sal_Int32, sal_Int16) throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::updateShort(sal_Int32, sal_Int16) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL MacabResultSet::updateInt(sal_Int32, sal_Int32) throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::updateInt(sal_Int32, sal_Int32) { checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); } -void SAL_CALL MacabResultSet::updateLong(sal_Int32, sal_Int64) throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::updateLong(sal_Int32, sal_Int64) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL MacabResultSet::updateFloat(sal_Int32, float) throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::updateFloat(sal_Int32, float) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL MacabResultSet::updateDouble(sal_Int32, double) throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::updateDouble(sal_Int32, double) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL MacabResultSet::updateString(sal_Int32, const OUString&) throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::updateString(sal_Int32, const OUString&) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL MacabResultSet::updateBytes(sal_Int32, const Sequence< sal_Int8 >&) throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::updateBytes(sal_Int32, const Sequence< sal_Int8 >&) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL MacabResultSet::updateDate(sal_Int32, const Date&) throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::updateDate(sal_Int32, const Date&) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL MacabResultSet::updateTime(sal_Int32, const css::util::Time&) throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::updateTime(sal_Int32, const css::util::Time&) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL MacabResultSet::updateTimestamp(sal_Int32, const DateTime&) throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::updateTimestamp(sal_Int32, const DateTime&) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL MacabResultSet::updateBinaryStream(sal_Int32, const Reference< XInputStream >&, sal_Int32) throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::updateBinaryStream(sal_Int32, const Reference< XInputStream >&, sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL MacabResultSet::updateCharacterStream(sal_Int32, const Reference< XInputStream >&, sal_Int32) throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::updateCharacterStream(sal_Int32, const Reference< XInputStream >&, sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL MacabResultSet::refreshRow() throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::refreshRow() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL MacabResultSet::updateObject(sal_Int32, const Any&) throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::updateObject(sal_Int32, const Any&) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } -void SAL_CALL MacabResultSet::updateNumericObject(sal_Int32, const Any&, sal_Int32) throw(SQLException, RuntimeException) +void SAL_CALL MacabResultSet::updateNumericObject(sal_Int32, const Any&, sal_Int32) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); } // XRowLocate -Any SAL_CALL MacabResultSet::getBookmark() throw( SQLException, RuntimeException) +Any SAL_CALL MacabResultSet::getBookmark() { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -892,7 +892,7 @@ Any SAL_CALL MacabResultSet::getBookmark() throw( SQLException, RuntimeExceptio return Any(); } -sal_Bool SAL_CALL MacabResultSet::moveToBookmark(const Any& bookmark) throw( SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSet::moveToBookmark(const Any& bookmark) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -919,7 +919,7 @@ sal_Bool SAL_CALL MacabResultSet::moveToBookmark(const Any& bookmark) throw( SQ return false; } -sal_Bool SAL_CALL MacabResultSet::moveRelativeToBookmark(const Any& bookmark, sal_Int32 rows) throw( SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSet::moveRelativeToBookmark(const Any& bookmark, sal_Int32 rows) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -940,7 +940,7 @@ sal_Bool SAL_CALL MacabResultSet::moveRelativeToBookmark(const Any& bookmark, s return false; } -sal_Int32 SAL_CALL MacabResultSet::compareBookmarks(const Any& firstItem, const Any& secondItem) throw( SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabResultSet::compareBookmarks(const Any& firstItem, const Any& secondItem) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -955,12 +955,12 @@ sal_Int32 SAL_CALL MacabResultSet::compareBookmarks(const Any& firstItem, const return CompareBookmark::EQUAL; } -sal_Bool SAL_CALL MacabResultSet::hasOrderedBookmarks() throw( SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSet::hasOrderedBookmarks() { return false; } -sal_Int32 SAL_CALL MacabResultSet::hashBookmark(const Any& bookmark) throw( SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabResultSet::hashBookmark(const Any& bookmark) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -971,7 +971,7 @@ sal_Int32 SAL_CALL MacabResultSet::hashBookmark(const Any& bookmark) throw( SQL } // XDeleteRows -Sequence< sal_Int32 > SAL_CALL MacabResultSet::deleteRows(const Sequence< Any >&) throw( SQLException, RuntimeException) +Sequence< sal_Int32 > SAL_CALL MacabResultSet::deleteRows(const Sequence< Any >&) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -1015,7 +1015,6 @@ sal_Bool MacabResultSet::convertFastPropertyValue( Any &, sal_Int32 nHandle, const Any& ) - throw (css::lang::IllegalArgumentException) { switch (nHandle) { @@ -1036,7 +1035,6 @@ sal_Bool MacabResultSet::convertFastPropertyValue( void MacabResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& ) - throw (Exception) { switch (nHandle) { diff --git a/connectivity/source/drivers/macab/MacabResultSet.hxx b/connectivity/source/drivers/macab/MacabResultSet.hxx index 086588554fed..418a66c1f5b6 100644 --- a/connectivity/source/drivers/macab/MacabResultSet.hxx +++ b/connectivity/source/drivers/macab/MacabResultSet.hxx @@ -76,12 +76,10 @@ namespace connectivity css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, - const css::uno::Any& rValue) - throw (css::lang::IllegalArgumentException) override; + const css::uno::Any& rValue) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const css::uno::Any& rValue) - throw (css::uno::Exception) override; + const css::uno::Any& rValue) override; virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle) const override; @@ -108,110 +106,110 @@ namespace connectivity virtual void SAL_CALL disposing() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; // XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; // XResultSet - virtual sal_Bool SAL_CALL isBeforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isAfterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL beforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL afterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL first( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL last( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL next( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL previous( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL refreshRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL rowUpdated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL rowInserted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL rowDeleted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL isBeforeFirst( ) override; + virtual sal_Bool SAL_CALL isAfterLast( ) override; + virtual sal_Bool SAL_CALL isFirst( ) override; + virtual sal_Bool SAL_CALL isLast( ) override; + virtual void SAL_CALL beforeFirst( ) override; + virtual void SAL_CALL afterLast( ) override; + virtual sal_Bool SAL_CALL first( ) override; + virtual sal_Bool SAL_CALL last( ) override; + virtual sal_Int32 SAL_CALL getRow( ) override; + virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) override; + virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) override; + virtual sal_Bool SAL_CALL next( ) override; + virtual sal_Bool SAL_CALL previous( ) override; + virtual void SAL_CALL refreshRow( ) override; + virtual sal_Bool SAL_CALL rowUpdated( ) override; + virtual sal_Bool SAL_CALL rowInserted( ) override; + virtual sal_Bool SAL_CALL rowDeleted( ) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement( ) override; // XRow - virtual sal_Bool SAL_CALL wasNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Bool SAL_CALL wasNull( ) override; + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) override; + virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override; + virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override; + virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override; + virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) override; + virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) override; + virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) override; + virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) override; + virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) override; + virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) override; + virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) override; + virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; + virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override; // XResultSetMetaDataSupplier - virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) override; // XCancellable - virtual void SAL_CALL cancel( ) throw(css::uno::RuntimeException) override; + virtual void SAL_CALL cancel( ) override; // XCloseable - virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL close( ) override; // XWarningsSupplier - virtual css::uno::Any SAL_CALL getWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL clearWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Any SAL_CALL getWarnings( ) override; + virtual void SAL_CALL clearWarnings( ) override; // XResultSetUpdate - virtual void SAL_CALL insertRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL updateRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL deleteRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL cancelRowUpdates( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL moveToInsertRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL moveToCurrentRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL insertRow( ) override; + virtual void SAL_CALL updateRow( ) override; + virtual void SAL_CALL deleteRow( ) override; + virtual void SAL_CALL cancelRowUpdates( ) override; + virtual void SAL_CALL moveToInsertRow( ) override; + virtual void SAL_CALL moveToCurrentRow( ) override; // XRowUpdate - virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) override; + virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) override; + virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) override; + virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) override; + virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) override; + virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) override; + virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) override; + virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) override; + virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) override; + virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) override; + virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) override; + virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) override; + virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) override; + virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) override; + virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) override; // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) override; // XRowLocate - virtual css::uno::Any SAL_CALL getBookmark( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& firstItem, const css::uno::Any& secondItem ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL hasOrderedBookmarks( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Any SAL_CALL getBookmark( ) override; + virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) override; + virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) override; + virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& firstItem, const css::uno::Any& secondItem ) override; + virtual sal_Bool SAL_CALL hasOrderedBookmarks( ) override; + virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) override; // XDeleteRows - virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const css::uno::Sequence< css::uno::Any >& rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const css::uno::Sequence< css::uno::Any >& rows ) override; }; } } diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx index 3436e3df0349..65ff01364635 100644 --- a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx +++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx @@ -41,7 +41,7 @@ MacabResultSetMetaData::~MacabResultSetMetaData() { } -void MacabResultSetMetaData::setMacabFields(const ::rtl::Reference &xColumns) throw(SQLException) +void MacabResultSetMetaData::setMacabFields(const ::rtl::Reference &xColumns) { OSQLColumns::Vector::const_iterator aIter; static const char aName[] = "Name"; @@ -70,13 +70,13 @@ void MacabResultSetMetaData::setMacabFields(const ::rtl::Referencetype); } -sal_Int32 SAL_CALL MacabResultSetMetaData::getColumnCount() throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabResultSetMetaData::getColumnCount() { return m_aMacabFields.size(); } -sal_Bool SAL_CALL MacabResultSetMetaData::isCaseSensitive(sal_Int32) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSetMetaData::isCaseSensitive(sal_Int32) { return true; } -OUString SAL_CALL MacabResultSetMetaData::getSchemaName(sal_Int32) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabResultSetMetaData::getSchemaName(sal_Int32) { return OUString(); } -OUString SAL_CALL MacabResultSetMetaData::getColumnName(sal_Int32 column) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabResultSetMetaData::getColumnName(sal_Int32 column) { sal_uInt32 nFieldNumber = m_aMacabFields[column - 1]; MacabRecords *aRecords; @@ -137,77 +137,77 @@ OUString SAL_CALL MacabResultSetMetaData::getColumnName(sal_Int32 column) throw( return aName; } -OUString SAL_CALL MacabResultSetMetaData::getTableName(sal_Int32) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabResultSetMetaData::getTableName(sal_Int32) { return m_sTableName; } -OUString SAL_CALL MacabResultSetMetaData::getCatalogName(sal_Int32) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabResultSetMetaData::getCatalogName(sal_Int32) { return OUString(); } -OUString SAL_CALL MacabResultSetMetaData::getColumnTypeName(sal_Int32) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabResultSetMetaData::getColumnTypeName(sal_Int32) { return OUString(); } -OUString SAL_CALL MacabResultSetMetaData::getColumnLabel(sal_Int32) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabResultSetMetaData::getColumnLabel(sal_Int32) { return OUString(); } -OUString SAL_CALL MacabResultSetMetaData::getColumnServiceName(sal_Int32) throw(SQLException, RuntimeException) +OUString SAL_CALL MacabResultSetMetaData::getColumnServiceName(sal_Int32) { return OUString(); } -sal_Bool SAL_CALL MacabResultSetMetaData::isCurrency(sal_Int32) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSetMetaData::isCurrency(sal_Int32) { return false; } -sal_Bool SAL_CALL MacabResultSetMetaData::isAutoIncrement(sal_Int32) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSetMetaData::isAutoIncrement(sal_Int32) { return false; } -sal_Bool SAL_CALL MacabResultSetMetaData::isSigned(sal_Int32) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSetMetaData::isSigned(sal_Int32) { return false; } -sal_Int32 SAL_CALL MacabResultSetMetaData::getPrecision(sal_Int32) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabResultSetMetaData::getPrecision(sal_Int32) { return 0; } -sal_Int32 SAL_CALL MacabResultSetMetaData::getScale(sal_Int32) throw(css::sdbc::SQLException, css::uno::RuntimeException) +sal_Int32 SAL_CALL MacabResultSetMetaData::getScale(sal_Int32) { return 0; } -sal_Int32 SAL_CALL MacabResultSetMetaData::isNullable(sal_Int32) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabResultSetMetaData::isNullable(sal_Int32) { return (sal_Int32) true; } -sal_Bool SAL_CALL MacabResultSetMetaData::isSearchable(sal_Int32) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSetMetaData::isSearchable(sal_Int32) { return true; } -sal_Bool SAL_CALL MacabResultSetMetaData::isReadOnly(sal_Int32) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSetMetaData::isReadOnly(sal_Int32) { return true; } -sal_Bool SAL_CALL MacabResultSetMetaData::isDefinitelyWritable(sal_Int32) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSetMetaData::isDefinitelyWritable(sal_Int32) { return false; } -sal_Bool SAL_CALL MacabResultSetMetaData::isWritable(sal_Int32) throw(SQLException, RuntimeException) +sal_Bool SAL_CALL MacabResultSetMetaData::isWritable(sal_Int32) { return false; } diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx index cc7ccf38b36c..ac795313484a 100644 --- a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx +++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx @@ -55,31 +55,31 @@ namespace connectivity /// @throws css::sdbc::SQLException void setMacabFields( - const ::rtl::Reference &xColumns) throw(css::sdbc::SQLException); + const ::rtl::Reference &xColumns); inline sal_uInt32 fieldAtColumn(sal_Int32 columnIndex) const { return m_aMacabFields[columnIndex - 1]; } - virtual sal_Int32 SAL_CALL getColumnCount( ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; - virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + virtual sal_Int32 SAL_CALL getColumnCount( ) override; + virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnName( sal_Int32 column ) override; + virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) override; + virtual OUString SAL_CALL getTableName( sal_Int32 column ) override; + virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) override; }; } } diff --git a/connectivity/source/drivers/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx index 40b0397d63b9..721bbe36c087 100644 --- a/connectivity/source/drivers/macab/MacabStatement.cxx +++ b/connectivity/source/drivers/macab/MacabStatement.cxx @@ -72,16 +72,16 @@ MacabCommonStatement::~MacabCommonStatement() { } -void MacabCommonStatement::resetParameters() const throw(css::sdbc::SQLException) +void MacabCommonStatement::resetParameters() const { } -void MacabCommonStatement::getNextParameter(OUString &) const throw(css::sdbc::SQLException) +void MacabCommonStatement::getNextParameter(OUString &) const { impl_throwError(STR_PARA_ONLY_PREPARED); } -MacabCondition *MacabCommonStatement::analyseWhereClause(const OSQLParseNode *pParseNode) const throw(SQLException) +MacabCondition *MacabCommonStatement::analyseWhereClause(const OSQLParseNode *pParseNode) const { if (pParseNode->count() == 3) { @@ -226,7 +226,7 @@ MacabCondition *MacabCommonStatement::analyseWhereClause(const OSQLParseNode *pP return nullptr; } -MacabOrder *MacabCommonStatement::analyseOrderByClause(const OSQLParseNode *pParseNode) const throw(SQLException) +MacabOrder *MacabCommonStatement::analyseOrderByClause(const OSQLParseNode *pParseNode) const { if (SQL_ISRULE(pParseNode, ordering_spec_commalist)) { @@ -286,7 +286,7 @@ OUString MacabCommonStatement::getTableName() const return xTabs.begin()->first; } -void MacabCommonStatement::setMacabFields(MacabResultSet *pResult) const throw(SQLException) +void MacabCommonStatement::setMacabFields(MacabResultSet *pResult) const { ::rtl::Reference xColumns; // selected columns MacabResultSetMetaData *pMeta; // meta information - holds the list of AddressBook fields @@ -304,7 +304,7 @@ void MacabCommonStatement::setMacabFields(MacabResultSet *pResult) const throw(S pMeta->setMacabFields(xColumns); } -void MacabCommonStatement::selectRecords(MacabResultSet *pResult) const throw(SQLException) +void MacabCommonStatement::selectRecords(MacabResultSet *pResult) const { const OSQLParseNode *pParseNode; @@ -329,7 +329,7 @@ void MacabCommonStatement::selectRecords(MacabResultSet *pResult) const throw(SQ pResult->allMacabRecords(); } -void MacabCommonStatement::sortRecords(MacabResultSet *pResult) const throw(SQLException) +void MacabCommonStatement::sortRecords(MacabResultSet *pResult) const { const OSQLParseNode *pParseNode; @@ -346,7 +346,7 @@ void MacabCommonStatement::sortRecords(MacabResultSet *pResult) const throw(SQLE } } -Any SAL_CALL MacabCommonStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL MacabCommonStatement::queryInterface( const Type & rType ) { Any aRet = MacabCommonStatement_BASE::queryInterface(rType); if (!aRet.hasValue()) @@ -354,7 +354,7 @@ Any SAL_CALL MacabCommonStatement::queryInterface( const Type & rType ) throw(Ru return aRet; } -Sequence< Type > SAL_CALL MacabCommonStatement::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL MacabCommonStatement::getTypes( ) { ::cppu::OTypeCollection aTypes( cppu::UnoType::get(), cppu::UnoType::get(), @@ -363,7 +363,7 @@ Sequence< Type > SAL_CALL MacabCommonStatement::getTypes( ) throw(RuntimeExcept return comphelper::concatSequences(aTypes.getTypes(),MacabCommonStatement_BASE::getTypes()); } -void SAL_CALL MacabCommonStatement::cancel( ) throw(RuntimeException) +void SAL_CALL MacabCommonStatement::cancel( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -371,7 +371,7 @@ void SAL_CALL MacabCommonStatement::cancel( ) throw(RuntimeException) // cancel the current sql statement } -void SAL_CALL MacabCommonStatement::close( ) throw(SQLException, RuntimeException) +void SAL_CALL MacabCommonStatement::close( ) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -382,7 +382,7 @@ void SAL_CALL MacabCommonStatement::close( ) throw(SQLException, RuntimeExcepti } sal_Bool SAL_CALL MacabCommonStatement::execute( - const OUString& sql ) throw(SQLException, RuntimeException) + const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); @@ -393,7 +393,7 @@ sal_Bool SAL_CALL MacabCommonStatement::execute( } Reference< XResultSet > SAL_CALL MacabCommonStatement::executeQuery( - const OUString& sql ) throw(SQLException, RuntimeException) + const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); @@ -450,7 +450,7 @@ Reference< XResultSet > SAL_CALL MacabCommonStatement::executeQuery( return xRS; } -Reference< XConnection > SAL_CALL MacabCommonStatement::getConnection( ) throw(SQLException, RuntimeException) +Reference< XConnection > SAL_CALL MacabCommonStatement::getConnection( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); @@ -459,7 +459,7 @@ Reference< XConnection > SAL_CALL MacabCommonStatement::getConnection( ) throw( return m_pConnection; } -sal_Int32 SAL_CALL MacabCommonStatement::executeUpdate( const OUString& ) throw(SQLException, RuntimeException) +sal_Int32 SAL_CALL MacabCommonStatement::executeUpdate( const OUString& ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); @@ -468,7 +468,7 @@ sal_Int32 SAL_CALL MacabCommonStatement::executeUpdate( const OUString& ) throw( return 0; } -Any SAL_CALL MacabCommonStatement::getWarnings( ) throw(SQLException, RuntimeException) +Any SAL_CALL MacabCommonStatement::getWarnings( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); @@ -476,7 +476,7 @@ Any SAL_CALL MacabCommonStatement::getWarnings( ) throw(SQLException, RuntimeEx return makeAny(m_aLastWarning); } -void SAL_CALL MacabCommonStatement::clearWarnings( ) throw(SQLException, RuntimeException) +void SAL_CALL MacabCommonStatement::clearWarnings( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(rBHelper.bDisposed); @@ -524,14 +524,14 @@ sal_Bool MacabCommonStatement::convertFastPropertyValue( Any &, Any &, sal_Int32, - const Any&) throw (css::lang::IllegalArgumentException) + const Any&) { bool bConverted = false; // here we have to try to convert return bConverted; } -void MacabCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any&) throw (Exception) +void MacabCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any&) { // set the value to whatever is necessary switch (nHandle) @@ -580,7 +580,7 @@ void SAL_CALL MacabCommonStatement::release() throw() MacabCommonStatement_BASE::release(); } -Reference< css::beans::XPropertySetInfo > SAL_CALL MacabCommonStatement::getPropertySetInfo( ) throw(RuntimeException) +Reference< css::beans::XPropertySetInfo > SAL_CALL MacabCommonStatement::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/macab/MacabStatement.hxx b/connectivity/source/drivers/macab/MacabStatement.hxx index 0d2f4c2e9664..ff80b2b4bf79 100644 --- a/connectivity/source/drivers/macab/MacabStatement.hxx +++ b/connectivity/source/drivers/macab/MacabStatement.hxx @@ -66,17 +66,17 @@ namespace connectivity protected: /// @throws css::sdbc::SQLException class MacabCondition *analyseWhereClause( - const OSQLParseNode *pParseNode) const throw(css::sdbc::SQLException); + const OSQLParseNode *pParseNode) const; /// @throws css::sdbc::SQLException class MacabOrder *analyseOrderByClause( - const OSQLParseNode *pParseNode) const throw(css::sdbc::SQLException); + const OSQLParseNode *pParseNode) const; OUString getTableName( ) const; /// @throws css::sdbc::SQLException - void setMacabFields(class MacabResultSet *pResult) const throw(css::sdbc::SQLException); + void setMacabFields(class MacabResultSet *pResult) const; /// @throws css::sdbc::SQLException - void selectRecords(MacabResultSet *pResult) const throw(css::sdbc::SQLException); + void selectRecords(MacabResultSet *pResult) const; /// @throws css::sdbc::SQLException - void sortRecords(MacabResultSet *pResult) const throw(css::sdbc::SQLException); + void sortRecords(MacabResultSet *pResult) const; // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const override; @@ -87,18 +87,18 @@ namespace connectivity css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, - const css::uno::Any& rValue) throw (css::lang::IllegalArgumentException) override; + const css::uno::Any& rValue) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const css::uno::Any& rValue) throw (css::uno::Exception) override; + const css::uno::Any& rValue) override; virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle) const override; /// @throws css::sdbc::SQLException - virtual void resetParameters() const throw(css::sdbc::SQLException); + virtual void resetParameters() const; /// @throws css::sdbc::SQLException - virtual void getNextParameter(OUString &rParameter) const throw(css::sdbc::SQLException); + virtual void getNextParameter(OUString &rParameter) const; virtual ~MacabCommonStatement() override; public: @@ -115,39 +115,39 @@ namespace connectivity virtual void SAL_CALL acquire() throw() override; virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType - ) throw(css::uno::RuntimeException, std::exception) override; + ) override; // XTypeProvider virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( - ) throw(css::uno::RuntimeException, std::exception) override; + ) override; // XPropertySet virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( - ) throw(css::uno::RuntimeException) override; + ) override; // XStatement virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( - const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + const OUString& sql ) override; virtual sal_Int32 SAL_CALL executeUpdate( - const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + const OUString& sql ) override; virtual sal_Bool SAL_CALL execute( - const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + const OUString& sql ) override; virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( - ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + ) override; // XWarningsSupplier virtual css::uno::Any SAL_CALL getWarnings( - ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + ) override; virtual void SAL_CALL clearWarnings( - ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + ) override; // XCancellable virtual void SAL_CALL cancel( - ) throw(css::uno::RuntimeException) override; + ) override; // XCloseable virtual void SAL_CALL close( - ) throw(css::sdbc::SQLException, css::uno::RuntimeException) override; + ) override; // other methods inline MacabConnection* getOwnConnection() const { return m_pConnection; } diff --git a/connectivity/source/drivers/macab/MacabTables.cxx b/connectivity/source/drivers/macab/MacabTables.cxx index a97c034df9d1..5a6e37927365 100644 --- a/connectivity/source/drivers/macab/MacabTables.cxx +++ b/connectivity/source/drivers/macab/MacabTables.cxx @@ -66,7 +66,7 @@ sdbcx::ObjectType MacabTables::createObject(const OUString& _rName) return xRet; } -void MacabTables::impl_refresh( ) throw(RuntimeException) +void MacabTables::impl_refresh( ) { static_cast(m_rParent).refreshTables(); } diff --git a/connectivity/source/drivers/macab/MacabTables.hxx b/connectivity/source/drivers/macab/MacabTables.hxx index 926eec0d0370..849e3e0f2634 100644 --- a/connectivity/source/drivers/macab/MacabTables.hxx +++ b/connectivity/source/drivers/macab/MacabTables.hxx @@ -33,7 +33,7 @@ namespace connectivity protected: virtual sdbcx::ObjectType createObject(const OUString& _rName) override; - virtual void impl_refresh() throw(css::uno::RuntimeException) override; + virtual void impl_refresh() override; public: MacabTables( diff --git a/connectivity/source/drivers/macab/macabcondition.cxx b/connectivity/source/drivers/macab/macabcondition.cxx index c0f10a77b79f..0d1d20227a42 100644 --- a/connectivity/source/drivers/macab/macabcondition.cxx +++ b/connectivity/source/drivers/macab/macabcondition.cxx @@ -51,7 +51,7 @@ bool MacabConditionConstant::eval(const MacabRecord *) const return m_bValue; } -MacabConditionColumn::MacabConditionColumn(const MacabHeader *header, const OUString &sColumnName) throw(SQLException) +MacabConditionColumn::MacabConditionColumn(const MacabHeader *header, const OUString &sColumnName) : MacabCondition(), m_nFieldNumber(header->getColumnNumber(sColumnName)) { @@ -69,7 +69,7 @@ bool MacabConditionColumn::isAlwaysFalse() const return false; } -MacabConditionNull::MacabConditionNull(const MacabHeader *header, const OUString &sColumnName) throw(SQLException) +MacabConditionNull::MacabConditionNull(const MacabHeader *header, const OUString &sColumnName) : MacabConditionColumn(header, sColumnName) { } @@ -86,7 +86,7 @@ bool MacabConditionNull::eval(const MacabRecord *aRecord) const return false; } -MacabConditionNotNull::MacabConditionNotNull(const MacabHeader *header, const OUString &sColumnName) throw(SQLException) +MacabConditionNotNull::MacabConditionNotNull(const MacabHeader *header, const OUString &sColumnName) : MacabConditionColumn(header, sColumnName) { } @@ -103,13 +103,13 @@ bool MacabConditionNotNull::eval(const MacabRecord *aRecord) const return true; } -MacabConditionCompare::MacabConditionCompare(const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString) throw(SQLException) +MacabConditionCompare::MacabConditionCompare(const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString) : MacabConditionColumn(header, sColumnName), m_sMatchString(sMatchString) { } -MacabConditionEqual::MacabConditionEqual(const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString) throw(SQLException) +MacabConditionEqual::MacabConditionEqual(const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString) : MacabConditionCompare(header, sColumnName, sMatchString) { } @@ -132,7 +132,7 @@ bool MacabConditionEqual::eval(const MacabRecord *aRecord) const return nReturn == 0; } -MacabConditionDifferent::MacabConditionDifferent(const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString) throw(SQLException) +MacabConditionDifferent::MacabConditionDifferent(const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString) : MacabConditionCompare(header, sColumnName, sMatchString) { } @@ -155,7 +155,7 @@ bool MacabConditionDifferent::eval(const MacabRecord *aRecord) const return nReturn != 0; } -MacabConditionSimilar::MacabConditionSimilar(const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString) throw(SQLException) +MacabConditionSimilar::MacabConditionSimilar(const MacabHeader *header, const OUString &sColumnName, const OUString &sMatchString) : MacabConditionCompare(header, sColumnName, sMatchString) { } diff --git a/connectivity/source/drivers/macab/macabcondition.hxx b/connectivity/source/drivers/macab/macabcondition.hxx index 24a5a32c57cc..3f6ce867a801 100644 --- a/connectivity/source/drivers/macab/macabcondition.hxx +++ b/connectivity/source/drivers/macab/macabcondition.hxx @@ -61,7 +61,7 @@ class MacabConditionColumn : public MacabCondition /// @throws css::sdbc::SQLException MacabConditionColumn( const MacabHeader *header, - const OUString &sColumnName) throw(css::sdbc::SQLException); + const OUString &sColumnName); virtual bool isAlwaysTrue() const override; virtual bool isAlwaysFalse() const override; }; @@ -72,7 +72,7 @@ class MacabConditionNull : public MacabConditionColumn /// @throws css::sdbc::SQLException MacabConditionNull( const MacabHeader *header, - const OUString &sColumnName) throw(css::sdbc::SQLException); + const OUString &sColumnName); virtual bool eval(const MacabRecord *aRecord) const override; }; @@ -82,7 +82,7 @@ class MacabConditionNotNull : public MacabConditionColumn /// @throws css::sdbc::SQLException MacabConditionNotNull( const MacabHeader *header, - const OUString &sColumnName) throw(css::sdbc::SQLException); + const OUString &sColumnName); virtual bool eval(const MacabRecord *aRecord) const override; }; @@ -96,7 +96,7 @@ class MacabConditionCompare : public MacabConditionColumn MacabConditionCompare( const MacabHeader *header, const OUString &sColumnName, - const OUString &sMatchString) throw(css::sdbc::SQLException); + const OUString &sMatchString); }; class MacabConditionEqual : public MacabConditionCompare @@ -106,7 +106,7 @@ class MacabConditionEqual : public MacabConditionCompare MacabConditionEqual( const MacabHeader *header, const OUString &sColumnName, - const OUString &sMatchString) throw(css::sdbc::SQLException); + const OUString &sMatchString); virtual bool eval(const MacabRecord *aRecord) const override; }; @@ -117,7 +117,7 @@ class MacabConditionDifferent : public MacabConditionCompare MacabConditionDifferent( const MacabHeader *header, const OUString &sColumnName, - const OUString &sMatchString) throw(css::sdbc::SQLException); + const OUString &sMatchString); virtual bool eval(const MacabRecord *aRecord) const override; }; @@ -128,7 +128,7 @@ class MacabConditionSimilar : public MacabConditionCompare MacabConditionSimilar( const MacabHeader *header, const OUString &sColumnName, - const OUString &sMatchString) throw(css::sdbc::SQLException); + const OUString &sMatchString); virtual bool eval(const MacabRecord *aRecord) const override; }; diff --git a/connectivity/source/drivers/mork/MCatalog.cxx b/connectivity/source/drivers/mork/MCatalog.cxx index d8b81ef270cd..c9f8d759b17b 100644 --- a/connectivity/source/drivers/mork/MCatalog.cxx +++ b/connectivity/source/drivers/mork/MCatalog.cxx @@ -76,7 +76,7 @@ void OCatalog::refreshUsers() // XTablesSupplier -Reference< XNameAccess > SAL_CALL OCatalog::getTables( ) throw(RuntimeException, std::exception) +Reference< XNameAccess > SAL_CALL OCatalog::getTables( ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); diff --git a/connectivity/source/drivers/mork/MCatalog.hxx b/connectivity/source/drivers/mork/MCatalog.hxx index 5f4b8245369f..5f5f817e78c8 100644 --- a/connectivity/source/drivers/mork/MCatalog.hxx +++ b/connectivity/source/drivers/mork/MCatalog.hxx @@ -38,7 +38,7 @@ namespace connectivity virtual void refreshViews() override ; virtual void refreshGroups() override; virtual void refreshUsers() override ; - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTables( ) override; public: explicit OCatalog(OConnection* _pCon); diff --git a/connectivity/source/drivers/mork/MColumns.cxx b/connectivity/source/drivers/mork/MColumns.cxx index 8691376d1d70..b5f791f2bbb4 100644 --- a/connectivity/source/drivers/mork/MColumns.cxx +++ b/connectivity/source/drivers/mork/MColumns.cxx @@ -71,7 +71,7 @@ sdbcx::ObjectType OColumns::createObject(const OUString& _rName) } -void OColumns::impl_refresh() throw(RuntimeException) +void OColumns::impl_refresh() { m_pTable->refreshColumns(); } diff --git a/connectivity/source/drivers/mork/MColumns.hxx b/connectivity/source/drivers/mork/MColumns.hxx index b49d0266c8d0..4f828ead53f4 100644 --- a/connectivity/source/drivers/mork/MColumns.hxx +++ b/connectivity/source/drivers/mork/MColumns.hxx @@ -35,7 +35,7 @@ namespace connectivity OTable* m_pTable; virtual sdbcx::ObjectType createObject(const OUString& _rName) override; - virtual void impl_refresh() throw(css::uno::RuntimeException) override; + virtual void impl_refresh() override; public: OColumns( OTable* _pTable, ::osl::Mutex& _rMutex, diff --git a/connectivity/source/drivers/mork/MConnection.cxx b/connectivity/source/drivers/mork/MConnection.cxx index 4a58a4ed257e..3dd4b2bef429 100644 --- a/connectivity/source/drivers/mork/MConnection.cxx +++ b/connectivity/source/drivers/mork/MConnection.cxx @@ -61,7 +61,7 @@ void SAL_CALL OConnection::release() throw() } -void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& info) throw(SQLException) +void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& info) { (void) info; // avoid warnings SAL_INFO("connectivity.mork", "=> OConnection::construct()" ); @@ -176,7 +176,7 @@ void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& IMPLEMENT_SERVICE_INFO(OConnection, "com.sun.star.sdbc.drivers.mork.OConnection", "com.sun.star.sdbc.Connection") -Reference< XStatement > SAL_CALL OConnection::createStatement( ) throw(SQLException, RuntimeException, std::exception) +Reference< XStatement > SAL_CALL OConnection::createStatement( ) { SAL_INFO("connectivity.mork", "=> OConnection::createStatement()" ); @@ -190,7 +190,7 @@ Reference< XStatement > SAL_CALL OConnection::createStatement( ) throw(SQLExcep return xReturn; } -Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& _sSql ) throw(SQLException, RuntimeException, std::exception) +Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& _sSql ) { SAL_INFO("connectivity.mork", "=> OConnection::prepareStatement()" ); SAL_INFO("connectivity.mork", "OConnection::prepareStatement( " << _sSql << " )"); @@ -209,7 +209,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OU return xReturn; } -Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& _sSql ) throw(SQLException, RuntimeException, std::exception) +Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& _sSql ) { SAL_INFO("connectivity.mork", "=> OConnection::prepareCall()" ); SAL_INFO("connectivity.mork", "sql: " << _sSql); @@ -218,7 +218,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUStrin return nullptr; } -OUString SAL_CALL OConnection::nativeSQL( const OUString& _sSql ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OConnection::nativeSQL( const OUString& _sSql ) { SAL_INFO("connectivity.mork", "=> OConnection::nativeSQL()" ); SAL_INFO("connectivity.mork", "sql: " << _sSql); @@ -230,12 +230,12 @@ OUString SAL_CALL OConnection::nativeSQL( const OUString& _sSql ) throw(SQLExcep return _sSql; } -void SAL_CALL OConnection::setAutoCommit( sal_Bool /*autoCommit*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::setAutoCommit( sal_Bool /*autoCommit*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setAutoCommit", *this ); } -sal_Bool SAL_CALL OConnection::getAutoCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OConnection::getAutoCommit( ) { // you have to distinguish which if you are in autocommit mode or not // at normal case true should be fine here @@ -243,17 +243,17 @@ sal_Bool SAL_CALL OConnection::getAutoCommit( ) throw(SQLException, RuntimeExce return true; } -void SAL_CALL OConnection::commit( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::commit( ) { // when you database does support transactions you should commit here } -void SAL_CALL OConnection::rollback( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::rollback( ) { // same as commit but for the other case } -sal_Bool SAL_CALL OConnection::isClosed( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OConnection::isClosed( ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -261,7 +261,7 @@ sal_Bool SAL_CALL OConnection::isClosed( ) throw(SQLException, RuntimeException return OConnection_BASE::rBHelper.bDisposed; } -Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData( ) { SAL_INFO("connectivity.mork", "=> OConnection::getMetaData()" ); @@ -280,51 +280,51 @@ Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData( ) throw(SQLEx return xMetaData; } -void SAL_CALL OConnection::setReadOnly( sal_Bool /*readOnly*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::setReadOnly( sal_Bool /*readOnly*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setReadOnly", *this ); } -sal_Bool SAL_CALL OConnection::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OConnection::isReadOnly( ) { // return if your connection to readonly return false; } -void SAL_CALL OConnection::setCatalog( const OUString& /*catalog*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::setCatalog( const OUString& /*catalog*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setCatalog", *this ); } -OUString SAL_CALL OConnection::getCatalog( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OConnection::getCatalog( ) { return OUString(); } -void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 /*level*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setTransactionIsolation", *this ); } -sal_Int32 SAL_CALL OConnection::getTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OConnection::getTransactionIsolation( ) { // please have a look at @see com.sun.star.sdbc.TransactionIsolation return TransactionIsolation::NONE; } -Reference< css::container::XNameAccess > SAL_CALL OConnection::getTypeMap( ) throw(SQLException, RuntimeException, std::exception) +Reference< css::container::XNameAccess > SAL_CALL OConnection::getTypeMap( ) { // if your driver has special database types you can return it here return nullptr; } -void SAL_CALL OConnection::setTypeMap( const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::setTypeMap( const Reference< css::container::XNameAccess >& /*typeMap*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setTypeMap", *this ); } // XCloseable -void SAL_CALL OConnection::close( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::close( ) { // we just dispose us { @@ -336,13 +336,13 @@ void SAL_CALL OConnection::close( ) throw(SQLException, RuntimeException, std:: } // XWarningsSupplier -Any SAL_CALL OConnection::getWarnings( ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OConnection::getWarnings( ) { // when you collected some warnings -> return it return Any(); } -void SAL_CALL OConnection::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::clearWarnings( ) { // you should clear your collected warnings here } diff --git a/connectivity/source/drivers/mork/MConnection.hxx b/connectivity/source/drivers/mork/MConnection.hxx index d7364c3e908b..37606ea0387b 100644 --- a/connectivity/source/drivers/mork/MConnection.hxx +++ b/connectivity/source/drivers/mork/MConnection.hxx @@ -49,7 +49,7 @@ namespace connectivity public: /// @throws css::sdbc::SQLException - void construct( const OUString& url,const css::uno::Sequence< css::beans::PropertyValue >& info) throw(css::sdbc::SQLException); + void construct( const OUString& url,const css::uno::Sequence< css::beans::PropertyValue >& info); explicit OConnection(MorkDriver* const driver); virtual ~OConnection() override; @@ -64,29 +64,29 @@ namespace connectivity // XServiceInfo DECLARE_SERVICE_INFO(); // XConnection - virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL nativeSQL( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getAutoCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL commit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL rollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isClosed( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCatalog( const OUString& catalog ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCatalog( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XStatement > SAL_CALL createStatement( ) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const OUString& sql ) override; + virtual css::uno::Reference< css::sdbc::XPreparedStatement > SAL_CALL prepareCall( const OUString& sql ) override; + virtual OUString SAL_CALL nativeSQL( const OUString& sql ) override; + virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) override; + virtual sal_Bool SAL_CALL getAutoCommit( ) override; + virtual void SAL_CALL commit( ) override; + virtual void SAL_CALL rollback( ) override; + virtual sal_Bool SAL_CALL isClosed( ) override; + virtual css::uno::Reference< css::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) override; + virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) override; + virtual sal_Bool SAL_CALL isReadOnly( ) override; + virtual void SAL_CALL setCatalog( const OUString& catalog ) override; + virtual OUString SAL_CALL getCatalog( ) override; + virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) override; + virtual sal_Int32 SAL_CALL getTransactionIsolation( ) override; + virtual css::uno::Reference< css::container::XNameAccess > SAL_CALL getTypeMap( ) override; + virtual void SAL_CALL setTypeMap( const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; // XCloseable - virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) override; // XWarningsSupplier - virtual css::uno::Any SAL_CALL getWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearWarnings() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getWarnings( ) override; + virtual void SAL_CALL clearWarnings() override; const OColumnAlias & getColumnAlias() const { return m_aColumnAlias; } diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx index 9dfdcc364d43..5bb771428786 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx @@ -51,7 +51,7 @@ ODatabaseMetaData::~ODatabaseMetaData() ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows( const OUString& tableNamePattern, - const OUString& columnNamePattern ) throw(SQLException) + const OUString& columnNamePattern ) { SAL_INFO("connectivity.mork", "=> ODatabaseMetaData::getColumnRows()" ); SAL_INFO("connectivity.mork", "tableNamePattern: " << tableNamePattern); @@ -143,55 +143,55 @@ OUString ODatabaseMetaData::impl_getCatalogSeparator_throw( ) return OUString(); } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength( ) { sal_Int32 nValue = 65535; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength( ) { sal_Int32 nValue = 254; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength( ) { sal_Int32 nValue = 20; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; @@ -202,7 +202,7 @@ sal_Int32 ODatabaseMetaData::impl_getMaxStatements_throw( ) return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; @@ -215,17 +215,17 @@ sal_Int32 ODatabaseMetaData::impl_getMaxTablesInSelect_throw( ) } -sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers( ) { return false; } @@ -235,17 +235,17 @@ bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) return false; } -sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers( ) { return false; } @@ -260,18 +260,18 @@ bool ODatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw( ) return false; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) { return false; } -OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) { OUString aVal; return aVal; @@ -283,13 +283,13 @@ OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( ) return OUString( "\""); } -OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) { OUString aVal; return aVal; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( ) { return true; } @@ -299,58 +299,58 @@ bool ODatabaseMetaData::impl_isCatalogAtStart_throw( ) return true; } -sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly( ) { //We support create table return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 /*level*/ ) { return false; } @@ -360,22 +360,22 @@ bool ODatabaseMetaData::impl_supportsSchemasInDataManipulation_throw( ) return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL( ) { return true; // should be supported at least } -sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions( ) { return false; } @@ -390,7 +390,7 @@ bool ODatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw( ) return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions( ) { return false; } @@ -400,55 +400,55 @@ bool ODatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw( ) return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins( ) { return false; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength( ) { return 0;// 0 means no limit } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable( ) { // We allow you to select from any table. return true; } -sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly( ) { //we support insert/update/delete now //But we have to set this to return sal_True otherwise the UI will add create "table/edit table" @@ -456,93 +456,93 @@ sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeE return true; } -sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing( ) { // Support added for this. return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, sal_Int32 /*toType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, sal_Int32 /*toType*/ ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers( ) { return true; } @@ -553,277 +553,277 @@ bool ODatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw( ) return true; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) { return false; } -OUString SAL_CALL ODatabaseMetaData::getURL( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getURL( ) { ::osl::MutexGuard aGuard( m_aMutex ); return m_pConnection->getURL(); } -OUString SAL_CALL ODatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getUserName( ) { OUString aValue; return aValue; } -OUString SAL_CALL ODatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getDriverName( ) { OUString aValue; return aValue; } -OUString SAL_CALL ODatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getDriverVersion() { OUString aValue = OUString::number(1); return aValue; } -OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) { OUString aValue = OUString::number(0); return aValue; } -OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) { OUString aValue; return aValue; } -OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) { OUString aValue; return aValue; } -OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) { OUString aValue; return aValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion( ) { return 1; } -sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation( ) { return TransactionIsolation::NONE; } -sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) { return 0; } -OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) { OUString aValue; return aValue; } -OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) { OUString aValue; return aValue; } -OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) { return OUString(); } -OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) { return OUString(); } -OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) { return OUString(); } -OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) { return OUString(); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar( ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins( ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins( ) { return false; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength( ) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 /*setType*/ ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 /*setType*/, sal_Int32 /*concurrency*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 /*setType*/, sal_Int32 /*concurrency*/ ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 /*setType*/ ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 /*setType*/ ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 /*setType*/ ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 /*setType*/ ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 /*setType*/ ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 /*setType*/ ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 /*setType*/ ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 /*setType*/ ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 /*setType*/ ) { return true; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates( ) { return false; } @@ -833,7 +833,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates( ) throw(SQLException // of course you could implement it on your and you should do this because // the general way is more memory expensive -Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) { // there exists no possibility to get table types so we have to check static const OUStringLiteral sTableTypes[] = @@ -908,7 +908,7 @@ Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw( ) Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern, - const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception) + const OUString& columnNamePattern ) { // this returns an empty resultset where the column-names are already set // in special the metadata of the resultset already returns the right columns @@ -920,7 +920,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( const Any& /*catalog*/, const OUString& /*schemaPattern*/, - const OUString& tableNamePattern, const Sequence< OUString >& /*types*/ ) throw(SQLException, RuntimeException, std::exception) + const OUString& tableNamePattern, const Sequence< OUString >& /*types*/ ) { SAL_INFO("connectivity.mork", "=> ODatabaseMetaData::getTables()" ); // this returns an empty resultset where the column-names are already set @@ -945,7 +945,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( } Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( - const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern ) throw(SQLException, RuntimeException, std::exception) + const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern ) { SAL_INFO("connectivity.mork", "=> ODatabaseMetaData::getTablePrivileges()" ); ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTablePrivileges); @@ -1003,7 +1003,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( return xRef; } -Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) { return nullptr; } diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.hxx b/connectivity/source/drivers/mork/MDatabaseMetaData.hxx index 10fb2c478a0e..7673227fad10 100644 --- a/connectivity/source/drivers/mork/MDatabaseMetaData.hxx +++ b/connectivity/source/drivers/mork/MDatabaseMetaData.hxx @@ -28,7 +28,7 @@ namespace connectivity m_pMetaDataHelper; /// @throws css::sdbc::SQLException - ODatabaseMetaDataResultSet::ORows& SAL_CALL getColumnRows( const OUString& tableNamePattern, const OUString& columnNamePattern ) throw( css::sdbc::SQLException ); + ODatabaseMetaDataResultSet::ORows& SAL_CALL getColumnRows( const OUString& tableNamePattern, const OUString& columnNamePattern ); protected: virtual ~ODatabaseMetaData() override; @@ -55,131 +55,131 @@ namespace connectivity // as I mentioned before this interface is really BIG // XDatabaseMetaData - virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL allTablesAreSelectable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getURL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getUserName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedLow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDatabaseProductName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDatabaseProductVersion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDriverName( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDriverVersion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL usesLocalFiles( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSQLKeywords( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getNumericFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getStringFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSystemFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTimeDateFunctions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSearchStringEscape( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getExtraNameCharacters( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsColumnAliasing( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTypeConversion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsGroupBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSchemaTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getProcedureTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCatalogTerm( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsPositionedDelete( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsStoredProcedures( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsUnion( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsUnionAll( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxConnections( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxIndexLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxRowSize( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxStatementLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - - virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsBatchUpdates( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL allProceduresAreCallable( ) override; + virtual sal_Bool SAL_CALL allTablesAreSelectable( ) override; + virtual OUString SAL_CALL getURL( ) override; + virtual OUString SAL_CALL getUserName( ) override; + virtual sal_Bool SAL_CALL isReadOnly( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedHigh( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedLow( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedAtStart( ) override; + virtual sal_Bool SAL_CALL nullsAreSortedAtEnd( ) override; + virtual OUString SAL_CALL getDatabaseProductName( ) override; + virtual OUString SAL_CALL getDatabaseProductVersion( ) override; + virtual OUString SAL_CALL getDriverName( ) override; + virtual OUString SAL_CALL getDriverVersion( ) override; + virtual sal_Int32 SAL_CALL getDriverMajorVersion( ) override; + virtual sal_Int32 SAL_CALL getDriverMinorVersion( ) override; + virtual sal_Bool SAL_CALL usesLocalFiles( ) override; + virtual sal_Bool SAL_CALL usesLocalFilePerTable( ) override; + virtual sal_Bool SAL_CALL supportsMixedCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) override; + virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) override; + virtual OUString SAL_CALL getSQLKeywords( ) override; + virtual OUString SAL_CALL getNumericFunctions( ) override; + virtual OUString SAL_CALL getStringFunctions( ) override; + virtual OUString SAL_CALL getSystemFunctions( ) override; + virtual OUString SAL_CALL getTimeDateFunctions( ) override; + virtual OUString SAL_CALL getSearchStringEscape( ) override; + virtual OUString SAL_CALL getExtraNameCharacters( ) override; + virtual sal_Bool SAL_CALL supportsColumnAliasing( ) override; + virtual sal_Bool SAL_CALL nullPlusNonNullIsNull( ) override; + virtual sal_Bool SAL_CALL supportsTypeConversion( ) override; + virtual sal_Bool SAL_CALL supportsConvert( sal_Int32 fromType, sal_Int32 toType ) override; + virtual sal_Bool SAL_CALL supportsTableCorrelationNames( ) override; + virtual sal_Bool SAL_CALL supportsDifferentTableCorrelationNames( ) override; + virtual sal_Bool SAL_CALL supportsExpressionsInOrderBy( ) override; + virtual sal_Bool SAL_CALL supportsOrderByUnrelated( ) override; + virtual sal_Bool SAL_CALL supportsGroupBy( ) override; + virtual sal_Bool SAL_CALL supportsGroupByUnrelated( ) override; + virtual sal_Bool SAL_CALL supportsGroupByBeyondSelect( ) override; + virtual sal_Bool SAL_CALL supportsLikeEscapeClause( ) override; + virtual sal_Bool SAL_CALL supportsMultipleResultSets( ) override; + virtual sal_Bool SAL_CALL supportsMultipleTransactions( ) override; + virtual sal_Bool SAL_CALL supportsNonNullableColumns( ) override; + virtual sal_Bool SAL_CALL supportsMinimumSQLGrammar( ) override; + virtual sal_Bool SAL_CALL supportsCoreSQLGrammar( ) override; + virtual sal_Bool SAL_CALL supportsExtendedSQLGrammar( ) override; + virtual sal_Bool SAL_CALL supportsANSI92EntryLevelSQL( ) override; + virtual sal_Bool SAL_CALL supportsANSI92IntermediateSQL( ) override; + virtual sal_Bool SAL_CALL supportsANSI92FullSQL( ) override; + virtual sal_Bool SAL_CALL supportsIntegrityEnhancementFacility( ) override; + virtual sal_Bool SAL_CALL supportsOuterJoins( ) override; + virtual sal_Bool SAL_CALL supportsFullOuterJoins( ) override; + virtual sal_Bool SAL_CALL supportsLimitedOuterJoins( ) override; + virtual OUString SAL_CALL getSchemaTerm( ) override; + virtual OUString SAL_CALL getProcedureTerm( ) override; + virtual OUString SAL_CALL getCatalogTerm( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInProcedureCalls( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInIndexDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsSchemasInPrivilegeDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInProcedureCalls( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInIndexDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsCatalogsInPrivilegeDefinitions( ) override; + virtual sal_Bool SAL_CALL supportsPositionedDelete( ) override; + virtual sal_Bool SAL_CALL supportsPositionedUpdate( ) override; + virtual sal_Bool SAL_CALL supportsSelectForUpdate( ) override; + virtual sal_Bool SAL_CALL supportsStoredProcedures( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInComparisons( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInExists( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInIns( ) override; + virtual sal_Bool SAL_CALL supportsSubqueriesInQuantifieds( ) override; + virtual sal_Bool SAL_CALL supportsCorrelatedSubqueries( ) override; + virtual sal_Bool SAL_CALL supportsUnion( ) override; + virtual sal_Bool SAL_CALL supportsUnionAll( ) override; + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossCommit( ) override; + virtual sal_Bool SAL_CALL supportsOpenCursorsAcrossRollback( ) override; + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossCommit( ) override; + virtual sal_Bool SAL_CALL supportsOpenStatementsAcrossRollback( ) override; + virtual sal_Int32 SAL_CALL getMaxBinaryLiteralLength( ) override; + virtual sal_Int32 SAL_CALL getMaxCharLiteralLength( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInGroupBy( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInIndex( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInOrderBy( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInSelect( ) override; + virtual sal_Int32 SAL_CALL getMaxColumnsInTable( ) override; + virtual sal_Int32 SAL_CALL getMaxConnections( ) override; + virtual sal_Int32 SAL_CALL getMaxCursorNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxIndexLength( ) override; + virtual sal_Int32 SAL_CALL getMaxSchemaNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxProcedureNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxCatalogNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxRowSize( ) override; + virtual sal_Bool SAL_CALL doesMaxRowSizeIncludeBlobs( ) override; + virtual sal_Int32 SAL_CALL getMaxStatementLength( ) override; + virtual sal_Int32 SAL_CALL getMaxTableNameLength( ) override; + virtual sal_Int32 SAL_CALL getMaxUserNameLength( ) override; + virtual sal_Int32 SAL_CALL getDefaultTransactionIsolation( ) override; + virtual sal_Bool SAL_CALL supportsTransactions( ) override; + virtual sal_Bool SAL_CALL supportsTransactionIsolationLevel( sal_Int32 level ) override; + virtual sal_Bool SAL_CALL supportsDataDefinitionAndDataManipulationTransactions( ) override; + virtual sal_Bool SAL_CALL supportsDataManipulationTransactionsOnly( ) override; + virtual sal_Bool SAL_CALL dataDefinitionCausesTransactionCommit( ) override; + virtual sal_Bool SAL_CALL dataDefinitionIgnoredInTransactions( ) override; + + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTables( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const css::uno::Sequence< OUString >& types ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTableTypes( ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getTablePrivileges( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getColumns( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) override; + + virtual sal_Bool SAL_CALL supportsResultSetType( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) override; + virtual sal_Bool SAL_CALL ownUpdatesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL ownDeletesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL ownInsertsAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL othersUpdatesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL othersDeletesAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL othersInsertsAreVisible( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL updatesAreDetected( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL deletesAreDetected( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL insertsAreDetected( sal_Int32 setType ) override; + virtual sal_Bool SAL_CALL supportsBatchUpdates( ) override; + + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getUDTs( const css::uno::Any& catalog, const OUString& schemaPattern, const OUString& typeNamePattern, const css::uno::Sequence< sal_Int32 >& types ) override; }; } } diff --git a/connectivity/source/drivers/mork/MDriver.cxx b/connectivity/source/drivers/mork/MDriver.cxx index 16180de53257..a45f149f6a33 100644 --- a/connectivity/source/drivers/mork/MDriver.cxx +++ b/connectivity/source/drivers/mork/MDriver.cxx @@ -29,19 +29,16 @@ MorkDriver::MorkDriver(const css::uno::Reference< css::uno::XComponentContext >& } OUString SAL_CALL MorkDriver::getImplementationName() - throw (css::uno::RuntimeException, std::exception) { return OUString(MORK_DRIVER_IMPL_NAME); } sal_Bool SAL_CALL MorkDriver::supportsService(const OUString& serviceName) - throw (css::uno::RuntimeException, std::exception) { return cppu::supportsService(this, serviceName); } css::uno::Sequence< OUString > MorkDriver::getSupportedServiceNames() - throw (css::uno::RuntimeException, std::exception) { return { "com.sun.star.sdbc.Driver" }; } @@ -49,7 +46,6 @@ css::uno::Sequence< OUString > MorkDriver::getSupportedServiceNames() css::uno::Reference< css::sdbc::XConnection > MorkDriver::connect( OUString const & url, css::uno::Sequence< css::beans::PropertyValue > const & info) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { SAL_INFO("connectivity.mork", "=> MorkDriver::connect()" ); @@ -81,7 +77,6 @@ css::uno::Reference< css::sdbc::XConnection > MorkDriver::connect( } sal_Bool MorkDriver::acceptsURL(OUString const & url) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { SAL_INFO("connectivity.mork", "=> MorkDriver::acceptsURL()" ); // Skip 'sdbc:mozab: part of URL @@ -119,19 +114,18 @@ sal_Bool MorkDriver::acceptsURL(OUString const & url) css::uno::Sequence< css::sdbc::DriverPropertyInfo > MorkDriver::getPropertyInfo( OUString const & url, css::uno::Sequence< css::beans::PropertyValue > const & info) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { //... TODO (void) url; (void) info; // avoid warnings return css::uno::Sequence< css::sdbc::DriverPropertyInfo >(); } -sal_Int32 MorkDriver::getMajorVersion() throw (css::uno::RuntimeException, std::exception) { +sal_Int32 MorkDriver::getMajorVersion() { //... TODO return 0; } -sal_Int32 MorkDriver::getMinorVersion() throw (css::uno::RuntimeException, std::exception) { +sal_Int32 MorkDriver::getMinorVersion() { //... TODO return 0; } diff --git a/connectivity/source/drivers/mork/MDriver.hxx b/connectivity/source/drivers/mork/MDriver.hxx index e17b5ed7950d..7d598f26ab04 100644 --- a/connectivity/source/drivers/mork/MDriver.hxx +++ b/connectivity/source/drivers/mork/MDriver.hxx @@ -44,35 +44,28 @@ private: virtual ~MorkDriver() override {} - virtual OUString SAL_CALL getImplementationName() - throw (css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName() override; - virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL supportsService(OUString const & ServiceName) override; virtual css::uno::Sequence< OUString > SAL_CALL - getSupportedServiceNames() throw (css::uno::RuntimeException, std::exception) override; + getSupportedServiceNames() override; virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL connect( OUString const & url, - css::uno::Sequence< css::beans::PropertyValue > const & info) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< css::beans::PropertyValue > const & info) override; virtual sal_Bool SAL_CALL acceptsURL( - OUString const & url) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + OUString const & url) override; virtual css::uno::Sequence< css::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( OUString const & url, - css::uno::Sequence< css::beans::PropertyValue > const & info) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + css::uno::Sequence< css::beans::PropertyValue > const & info) override; - virtual sal_Int32 SAL_CALL getMajorVersion() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMajorVersion() override; - virtual sal_Int32 SAL_CALL getMinorVersion() - throw (css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL getMinorVersion() override; css::uno::Reference< css::uno::XComponentContext > context_; css::uno::Reference< css::lang::XMultiServiceFactory > m_xFactory; diff --git a/connectivity/source/drivers/mork/MPreparedStatement.cxx b/connectivity/source/drivers/mork/MPreparedStatement.cxx index 51f1dd2e8e5d..82a7a3aac69c 100644 --- a/connectivity/source/drivers/mork/MPreparedStatement.cxx +++ b/connectivity/source/drivers/mork/MPreparedStatement.cxx @@ -57,7 +57,6 @@ void SAL_CALL OPreparedStatement::disposing() } OCommonStatement::StatementType OPreparedStatement::parseSql( const OUString& sql , bool bAdjusted ) - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { StatementType eStatementType = OCommonStatement::parseSql( sql, bAdjusted ); if ( eStatementType != eSelect ) @@ -107,7 +106,7 @@ void SAL_CALL OPreparedStatement::release() throw() OCommonStatement::release(); } -Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) { Any aRet = OCommonStatement::queryInterface(rType); if(!aRet.hasValue()) @@ -115,13 +114,13 @@ Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(Runt return aRet; } -css::uno::Sequence< css::uno::Type > SAL_CALL OPreparedStatement::getTypes( ) throw(css::uno::RuntimeException, std::exception) +css::uno::Sequence< css::uno::Type > SAL_CALL OPreparedStatement::getTypes( ) { return ::comphelper::concatSequences(OPreparedStatement_BASE::getTypes(),OCommonStatement::getTypes()); } -Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed); @@ -139,7 +138,7 @@ Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData( ) thr } -sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OPreparedStatement::execute( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed); @@ -149,14 +148,14 @@ sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeExc } -sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) { ::dbtools::throwFeatureNotImplementedSQLException( "XStatement::executeUpdate", *this ); return 0; } -void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed); @@ -165,7 +164,7 @@ void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUS } -Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( ) throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed); @@ -174,7 +173,7 @@ Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( ) throw(SQ } -Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed); @@ -185,60 +184,60 @@ Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) throw(SQLE } -void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 /*parameterIndex*/, sal_Bool /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 /*parameterIndex*/, sal_Bool /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setBoolean", *this ); } -void SAL_CALL OPreparedStatement::setByte( sal_Int32 /*parameterIndex*/, sal_Int8 /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setByte( sal_Int32 /*parameterIndex*/, sal_Int8 /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setByte", *this ); } -void SAL_CALL OPreparedStatement::setDate( sal_Int32 /*parameterIndex*/, const Date& /*aData*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setDate( sal_Int32 /*parameterIndex*/, const Date& /*aData*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setDate", *this ); } -void SAL_CALL OPreparedStatement::setTime( sal_Int32 /*parameterIndex*/, const css::util::Time& /*aVal*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setTime( sal_Int32 /*parameterIndex*/, const css::util::Time& /*aVal*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setTime", *this ); } -void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 /*parameterIndex*/, const DateTime& /*aVal*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 /*parameterIndex*/, const DateTime& /*aVal*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setTimestamp", *this ); } -void SAL_CALL OPreparedStatement::setDouble( sal_Int32 /*parameterIndex*/, double /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setDouble( sal_Int32 /*parameterIndex*/, double /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setDouble", *this ); } -void SAL_CALL OPreparedStatement::setFloat( sal_Int32 /*parameterIndex*/, float /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setFloat( sal_Int32 /*parameterIndex*/, float /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setFloat", *this ); } -void SAL_CALL OPreparedStatement::setInt( sal_Int32 /*parameterIndex*/, sal_Int32 /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setInt( sal_Int32 /*parameterIndex*/, sal_Int32 /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setInt", *this ); } -void SAL_CALL OPreparedStatement::setLong( sal_Int32 /*parameterIndex*/, sal_Int64 /*aVal*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setLong( sal_Int32 /*parameterIndex*/, sal_Int64 /*aVal*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setLong", *this ); } -void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/ ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed); @@ -249,77 +248,77 @@ void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 / } -void SAL_CALL OPreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setClob", *this ); } -void SAL_CALL OPreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const Reference< XBlob >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const Reference< XBlob >& /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setBlob", *this ); } -void SAL_CALL OPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setArray", *this ); } -void SAL_CALL OPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setRef", *this ); } -void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 /*parameterIndex*/, const Any& /*x*/, sal_Int32 /*sqlType*/, sal_Int32 /*scale*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 /*parameterIndex*/, const Any& /*x*/, sal_Int32 /*sqlType*/, sal_Int32 /*scale*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setObjectWithInfo", *this ); } -void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) { setNull(parameterIndex,sqlType); } -void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) { ::dbtools::implSetObject(this,parameterIndex,x); } -void SAL_CALL OPreparedStatement::setShort( sal_Int32 /*parameterIndex*/, sal_Int16 /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setShort( sal_Int32 /*parameterIndex*/, sal_Int16 /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setShort", *this ); } -void SAL_CALL OPreparedStatement::setBytes( sal_Int32 /*parameterIndex*/, const Sequence< sal_Int8 >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setBytes( sal_Int32 /*parameterIndex*/, const Sequence< sal_Int8 >& /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setBytes", *this ); } -void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 /*parameterIndex*/, const Reference< css::io::XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 /*parameterIndex*/, const Reference< css::io::XInputStream >& /*x*/, sal_Int32 /*length*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setCharacterStream", *this ); } -void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 /*parameterIndex*/, const Reference< css::io::XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 /*parameterIndex*/, const Reference< css::io::XInputStream >& /*x*/, sal_Int32 /*length*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XParameters::setBinaryStream", *this ); } -void SAL_CALL OPreparedStatement::clearParameters( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::clearParameters( ) { } -void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception, std::exception) +void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) { switch(nHandle) { @@ -468,17 +467,17 @@ void OPreparedStatement::scanParameter(OSQLParseNode* pParseNode,::std::vector< scanParameter(pParseNode->getChild(i),_rParaNodes); } -css::uno::Reference< css::sdbc::XResultSet > SAL_CALL OPreparedStatement::getResultSet( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +css::uno::Reference< css::sdbc::XResultSet > SAL_CALL OPreparedStatement::getResultSet( ) { return nullptr; } -sal_Int32 SAL_CALL OPreparedStatement::getUpdateCount( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL OPreparedStatement::getUpdateCount( ) { return 0; } -sal_Bool SAL_CALL OPreparedStatement::getMoreResults( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL OPreparedStatement::getMoreResults( ) { return false; } diff --git a/connectivity/source/drivers/mork/MPreparedStatement.hxx b/connectivity/source/drivers/mork/MPreparedStatement.hxx index 3fa14ef8da0a..bb4d2772326f 100644 --- a/connectivity/source/drivers/mork/MPreparedStatement.hxx +++ b/connectivity/source/drivers/mork/MPreparedStatement.hxx @@ -50,15 +50,14 @@ namespace connectivity protected: virtual void SAL_CALL setFastPropertyValue_NoBroadcast(sal_Int32 nHandle, - const css::uno::Any& rValue) - throw (css::uno::Exception, std::exception) override; + const css::uno::Any& rValue) override; virtual ~OPreparedStatement() override; virtual void SAL_CALL disposing() override; // OCommonStatement overridables virtual StatementType - parseSql( const OUString& sql , bool bAdjusted = false) throw ( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ) override; + parseSql( const OUString& sql , bool bAdjusted = false) override; virtual void initializeResultSet( OResultSet* _pResult ) override; virtual void clearCachedResultSet() override; virtual void cacheResultSet( const ::rtl::Reference< OResultSet >& _pResult ) override; @@ -80,47 +79,47 @@ namespace connectivity void lateInit(); //XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; //XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; // XPreparedStatement - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL executeUpdate( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL execute( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( ) override; + virtual sal_Int32 SAL_CALL executeUpdate( ) override; + virtual sal_Bool SAL_CALL execute( ) override; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) override; // XParameters - virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearParameters( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL setNull( sal_Int32 parameterIndex, sal_Int32 sqlType ) override; + virtual void SAL_CALL setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& typeName ) override; + virtual void SAL_CALL setBoolean( sal_Int32 parameterIndex, sal_Bool x ) override; + virtual void SAL_CALL setByte( sal_Int32 parameterIndex, sal_Int8 x ) override; + virtual void SAL_CALL setShort( sal_Int32 parameterIndex, sal_Int16 x ) override; + virtual void SAL_CALL setInt( sal_Int32 parameterIndex, sal_Int32 x ) override; + virtual void SAL_CALL setLong( sal_Int32 parameterIndex, sal_Int64 x ) override; + virtual void SAL_CALL setFloat( sal_Int32 parameterIndex, float x ) override; + virtual void SAL_CALL setDouble( sal_Int32 parameterIndex, double x ) override; + virtual void SAL_CALL setString( sal_Int32 parameterIndex, const OUString& x ) override; + virtual void SAL_CALL setBytes( sal_Int32 parameterIndex, const css::uno::Sequence< sal_Int8 >& x ) override; + virtual void SAL_CALL setDate( sal_Int32 parameterIndex, const css::util::Date& x ) override; + virtual void SAL_CALL setTime( sal_Int32 parameterIndex, const css::util::Time& x ) override; + virtual void SAL_CALL setTimestamp( sal_Int32 parameterIndex, const css::util::DateTime& x ) override; + virtual void SAL_CALL setBinaryStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL setCharacterStream( sal_Int32 parameterIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL setObject( sal_Int32 parameterIndex, const css::uno::Any& x ) override; + virtual void SAL_CALL setObjectWithInfo( sal_Int32 parameterIndex, const css::uno::Any& x, sal_Int32 targetSqlType, sal_Int32 scale ) override; + virtual void SAL_CALL setRef( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XRef >& x ) override; + virtual void SAL_CALL setBlob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XBlob >& x ) override; + virtual void SAL_CALL setClob( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XClob >& x ) override; + virtual void SAL_CALL setArray( sal_Int32 parameterIndex, const css::uno::Reference< css::sdbc::XArray >& x ) override; + virtual void SAL_CALL clearParameters( ) override; // XResultSetMetaDataSupplier - virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) override; // XMultipleResults - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getUpdateCount( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getMoreResults( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL getResultSet( ) override; + virtual sal_Int32 SAL_CALL getUpdateCount( ) override; + virtual sal_Bool SAL_CALL getMoreResults( ) override; public: using OCommonStatement::executeQuery; diff --git a/connectivity/source/drivers/mork/MResultSet.cxx b/connectivity/source/drivers/mork/MResultSet.cxx index 7ce0643280ca..e0211c3f0993 100644 --- a/connectivity/source/drivers/mork/MResultSet.cxx +++ b/connectivity/source/drivers/mork/MResultSet.cxx @@ -48,17 +48,17 @@ using namespace com::sun::star::util; // IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet"); -OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException, std::exception) +OUString SAL_CALL OResultSet::getImplementationName( ) { return OUString("com.sun.star.sdbcx.mork.ResultSet"); } - Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw( RuntimeException, std::exception) + Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) { return {"com.sun.star.sdbc.ResultSet","com.sun.star.sdbcx.ResultSet"}; } -sal_Bool SAL_CALL OResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } @@ -108,7 +108,7 @@ void OResultSet::disposing() m_xTable.clear(); } -Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OResultSet::queryInterface( const Type & rType ) { Any aRet = OPropertySetHelper::queryInterface(rType); if(!aRet.hasValue()) @@ -116,7 +116,7 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep return aRet; } - Sequence< Type > SAL_CALL OResultSet::getTypes( ) throw( RuntimeException, std::exception) + Sequence< Type > SAL_CALL OResultSet::getTypes( ) { OTypeCollection aTypes( cppu::UnoType::get(), cppu::UnoType::get(), @@ -136,7 +136,7 @@ void OResultSet::methodEntry() } -sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) { ResultSetEntryGuard aGuard( *this ); @@ -156,18 +156,18 @@ sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQ return 0; // Never reached } -Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) { return nullptr; } -Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) { return nullptr; } -sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 /*columnIndex*/ ) { ResultSetEntryGuard aGuard( *this ); m_bWasNull = true; @@ -175,49 +175,49 @@ sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 /*columnIndex*/ ) throw(SQLE } -sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 /*columnIndex*/ ) { ResultSetEntryGuard aGuard( *this ); return 0; } -Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 /*columnIndex*/ ) { ResultSetEntryGuard aGuard( *this ); return Sequence< sal_Int8 >(); } -Date SAL_CALL OResultSet::getDate( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Date SAL_CALL OResultSet::getDate( sal_Int32 /*columnIndex*/ ) { ResultSetEntryGuard aGuard( *this ); return Date(); } -double SAL_CALL OResultSet::getDouble( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +double SAL_CALL OResultSet::getDouble( sal_Int32 /*columnIndex*/ ) { ResultSetEntryGuard aGuard( *this ); return 0.0; } -float SAL_CALL OResultSet::getFloat( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +float SAL_CALL OResultSet::getFloat( sal_Int32 /*columnIndex*/ ) { ResultSetEntryGuard aGuard( *this ); return 0; } -sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 /*columnIndex*/ ) { ResultSetEntryGuard aGuard( *this ); return 0; } -sal_Int32 SAL_CALL OResultSet::getRow( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSet::getRow( ) { ResultSetEntryGuard aGuard( *this ); @@ -226,14 +226,14 @@ sal_Int32 SAL_CALL OResultSet::getRow( ) throw(SQLException, RuntimeException, } -sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 /*columnIndex*/ ) { ResultSetEntryGuard aGuard( *this ); return sal_Int64(); } -Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) { ResultSetEntryGuard aGuard( *this ); @@ -243,42 +243,42 @@ Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) throw(SQLEx return m_xMetaData; } -Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) { return nullptr; } -Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) { return nullptr; } -Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 /*columnIndex*/ ) { return nullptr; } -Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) { return nullptr; } -Any SAL_CALL OResultSet::getObject( sal_Int32 /*columnIndex*/, const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OResultSet::getObject( sal_Int32 /*columnIndex*/, const Reference< css::container::XNameAccess >& /*typeMap*/ ) { return Any(); } -sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 /*columnIndex*/ ) { return 0; } -void OResultSet::checkIndex(sal_Int32 columnIndex ) throw(css::sdbc::SQLException) +void OResultSet::checkIndex(sal_Int32 columnIndex ) { if(columnIndex <= 0 || columnIndex > (sal_Int32)m_xColumns->get().size()) ::dbtools::throwInvalidIndexException(*this); @@ -294,14 +294,14 @@ sal_uInt32 OResultSet::currentRowCount() } -bool OResultSet::fetchCurrentRow( ) throw(SQLException, RuntimeException) +bool OResultSet::fetchCurrentRow( ) { SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos); return fetchRow(getCurrentCardNumber()); } -bool OResultSet::fetchRow(sal_Int32 cardNumber,bool bForceReload) throw(SQLException, RuntimeException) +bool OResultSet::fetchRow(sal_Int32 cardNumber,bool bForceReload) { SAL_INFO("connectivity.mork", "cardNumber = " << cardNumber); if (!bForceReload) @@ -344,7 +344,7 @@ bool OResultSet::fetchRow(sal_Int32 cardNumber,bool bForceReload) throw(SQLExcep } -const ORowSetValue& OResultSet::getValue(sal_Int32 cardNumber, sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +const ORowSetValue& OResultSet::getValue(sal_Int32 cardNumber, sal_Int32 columnIndex ) { if ( !fetchRow( cardNumber ) ) { @@ -359,7 +359,7 @@ const ORowSetValue& OResultSet::getValue(sal_Int32 cardNumber, sal_Int32 columnI } -OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) { ResultSetEntryGuard aGuard( *this ); @@ -373,21 +373,21 @@ OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLExcept } -Time SAL_CALL OResultSet::getTime( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Time SAL_CALL OResultSet::getTime( sal_Int32 /*columnIndex*/ ) { ResultSetEntryGuard aGuard( *this ); return Time(); } -DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 /*columnIndex*/ ) { ResultSetEntryGuard aGuard( *this ); return DateTime(); } -sal_Bool SAL_CALL OResultSet::isBeforeFirst( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::isBeforeFirst( ) { ResultSetEntryGuard aGuard( *this ); @@ -396,7 +396,7 @@ sal_Bool SAL_CALL OResultSet::isBeforeFirst( ) throw(SQLException, RuntimeExcep return( m_nRowPos < 1 ); } -sal_Bool SAL_CALL OResultSet::isAfterLast( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::isAfterLast( ) { SAL_WARN("connectivity.mork", "OResultSet::isAfterLast() NOT IMPLEMENTED!"); ResultSetEntryGuard aGuard( *this ); @@ -405,14 +405,14 @@ sal_Bool SAL_CALL OResultSet::isAfterLast( ) throw(SQLException, RuntimeExcepti return m_nRowPos > currentRowCount() && MQueryHelper::queryComplete(); } -sal_Bool SAL_CALL OResultSet::isFirst( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::isFirst( ) { ResultSetEntryGuard aGuard( *this ); return m_nRowPos == 1; } -sal_Bool SAL_CALL OResultSet::isLast( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::isLast( ) { SAL_WARN("connectivity.mork", "OResultSet::isLast() NOT IMPLEMENTED!"); ResultSetEntryGuard aGuard( *this ); @@ -421,7 +421,7 @@ sal_Bool SAL_CALL OResultSet::isLast( ) throw(SQLException, RuntimeException, s return m_nRowPos == currentRowCount() && MQueryHelper::queryComplete(); } -void SAL_CALL OResultSet::beforeFirst( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::beforeFirst( ) { ResultSetEntryGuard aGuard( *this ); @@ -430,7 +430,7 @@ void SAL_CALL OResultSet::beforeFirst( ) throw(SQLException, RuntimeException, previous(); } -void SAL_CALL OResultSet::afterLast( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::afterLast( ) { ResultSetEntryGuard aGuard( *this ); @@ -439,61 +439,61 @@ void SAL_CALL OResultSet::afterLast( ) throw(SQLException, RuntimeException, st } -void SAL_CALL OResultSet::close() throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::close() { dispose(); } -sal_Bool SAL_CALL OResultSet::first( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::first( ) { return seekRow( FIRST_POS ); } -sal_Bool SAL_CALL OResultSet::last( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::last( ) { return seekRow( LAST_POS ); } -sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) { return seekRow( ABSOLUTE_POS, row ); } -sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) { return seekRow( RELATIVE_POS, row ); } -sal_Bool SAL_CALL OResultSet::previous( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::previous( ) { ResultSetEntryGuard aGuard( *this ); return seekRow( PRIOR_POS ); } -Reference< XInterface > SAL_CALL OResultSet::getStatement( ) throw(SQLException, RuntimeException, std::exception) +Reference< XInterface > SAL_CALL OResultSet::getStatement( ) { ResultSetEntryGuard aGuard( *this ); return m_xStatement; } -sal_Bool SAL_CALL OResultSet::rowDeleted( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::rowDeleted( ) { SAL_WARN("connectivity.mork", "OResultSet::rowDeleted() NOT IMPLEMENTED!"); ResultSetEntryGuard aGuard( *this ); return true;//return ((m_RowStates & RowStates_Deleted) == RowStates_Deleted) ; } -sal_Bool SAL_CALL OResultSet::rowInserted( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::rowInserted( ) { SAL_WARN("connectivity.mork", "OResultSet::rowInserted() NOT IMPLEMENTED!"); ResultSetEntryGuard aGuard( *this ); return true;//return ((m_RowStates & RowStates_Inserted) == RowStates_Inserted); } -sal_Bool SAL_CALL OResultSet::rowUpdated( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::rowUpdated( ) { SAL_WARN("connectivity.mork", "OResultSet::rowUpdated() NOT IMPLEMENTED!"); ResultSetEntryGuard aGuard( *this ); @@ -501,13 +501,13 @@ sal_Bool SAL_CALL OResultSet::rowUpdated( ) throw(SQLException, RuntimeExceptio } -sal_Bool SAL_CALL OResultSet::next( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::next( ) { return seekRow( NEXT_POS ); } -sal_Bool SAL_CALL OResultSet::wasNull( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::wasNull( ) { ResultSetEntryGuard aGuard( *this ); @@ -515,20 +515,20 @@ sal_Bool SAL_CALL OResultSet::wasNull( ) throw(SQLException, RuntimeException, } -void SAL_CALL OResultSet::cancel( ) throw(RuntimeException, std::exception) +void SAL_CALL OResultSet::cancel( ) { } -void SAL_CALL OResultSet::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::clearWarnings( ) { } -Any SAL_CALL OResultSet::getWarnings( ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OResultSet::getWarnings( ) { return Any(); } -void SAL_CALL OResultSet::refreshRow( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::refreshRow( ) { if (fetchRow(getCurrentCardNumber(),true)) { //force fetch current row will cause we lose all change to the current row @@ -569,7 +569,6 @@ sal_Bool OResultSet::convertFastPropertyValue( Any & /*rOldValue*/, sal_Int32 nHandle, const Any& /*rValue*/ ) - throw (css::lang::IllegalArgumentException) { OSL_FAIL( "OResultSet::convertFastPropertyValue: not implemented!" ); switch(nHandle) @@ -590,7 +589,6 @@ void OResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& /*rValue*/ ) - throw (Exception, std::exception) { OSL_FAIL( "OResultSet::setFastPropertyValue_NoBroadcast: not implemented!" ); switch(nHandle) @@ -644,7 +642,7 @@ void SAL_CALL OResultSet::release() throw() OResultSet_BASE::release(); } -css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) +css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } @@ -955,7 +953,6 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT } void OResultSet::fillRowData() - throw (css::sdbc::SQLException, css::uno::RuntimeException, std::exception) { OSL_ENSURE( m_pStatement, "Require a statement" ); @@ -1057,9 +1054,7 @@ sal_Int32 OResultSet::getRowForCardNumber(sal_Int32 nCardNum) return 0; } -void SAL_CALL OResultSet::executeQuery() throw(css::sdbc::SQLException, - css::uno::RuntimeException, - std::exception) +void SAL_CALL OResultSet::executeQuery() { ResultSetEntryGuard aGuard( *this ); @@ -1451,7 +1446,7 @@ void OResultSet::setColumnMapping(const ::std::vector& _aColumnMappin } -css::uno::Any OResultSet::getBookmark( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +css::uno::Any OResultSet::getBookmark( ) { SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos); ResultSetEntryGuard aGuard( *this ); @@ -1462,7 +1457,7 @@ css::uno::Any OResultSet::getBookmark( ) throw(css::sdbc::SQLException, css::un OSL_ENSURE((!m_aRow->isDeleted()),"getBookmark called for deleted row"); return makeAny((sal_Int32)(m_aRow->get())[0]); } -sal_Bool OResultSet::moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Bool OResultSet::moveToBookmark( const css::uno::Any& bookmark ) { ResultSetEntryGuard aGuard( *this ); SAL_INFO( @@ -1472,7 +1467,7 @@ sal_Bool OResultSet::moveToBookmark( const css::uno::Any& bookmark ) throw(css: fetchCurrentRow(); return true; } -sal_Bool OResultSet::moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Bool OResultSet::moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) { ResultSetEntryGuard aGuard( *this ); SAL_INFO( @@ -1482,7 +1477,7 @@ sal_Bool OResultSet::moveRelativeToBookmark( const css::uno::Any& bookmark, sal m_nRowPos = getRowForCardNumber(nCardNum); return seekRow(RELATIVE_POS,rows ); } -sal_Int32 OResultSet::compareBookmarks( const css::uno::Any& lhs, const css::uno::Any& rhs ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Int32 OResultSet::compareBookmarks( const css::uno::Any& lhs, const css::uno::Any& rhs ) { ResultSetEntryGuard aGuard( *this ); SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos); @@ -1503,13 +1498,13 @@ sal_Int32 OResultSet::compareBookmarks( const css::uno::Any& lhs, const css::uno return nResult; } -sal_Bool OResultSet::hasOrderedBookmarks( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Bool OResultSet::hasOrderedBookmarks( ) { ResultSetEntryGuard aGuard( *this ); SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos); return true; } -sal_Int32 OResultSet::hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Int32 OResultSet::hashBookmark( const css::uno::Any& bookmark ) { ResultSetEntryGuard aGuard( *this ); SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos); @@ -1524,7 +1519,7 @@ sal_Int32 OResultSet::getCurrentCardNumber() return 0; return (m_pKeySet->get())[m_nRowPos-1]; } -void OResultSet::checkPendingUpdate() throw(SQLException, RuntimeException) +void OResultSet::checkPendingUpdate() { OSL_FAIL( "OResultSet::checkPendingUpdate() not implemented" ); /* @@ -1542,7 +1537,7 @@ void OResultSet::checkPendingUpdate() throw(SQLException, RuntimeException) */ } -void OResultSet::updateValue(sal_Int32 columnIndex ,const ORowSetValue& x) throw(SQLException, RuntimeException) +void OResultSet::updateValue(sal_Int32 columnIndex ,const ORowSetValue& x) { SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos); ResultSetEntryGuard aGuard( *this ); @@ -1562,7 +1557,7 @@ void OResultSet::updateValue(sal_Int32 columnIndex ,const ORowSetValue& x) throw } -void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) { SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos); ResultSetEntryGuard aGuard( *this ); @@ -1580,72 +1575,72 @@ void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException } -void SAL_CALL OResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) { updateValue(columnIndex, static_cast(x)); } -void SAL_CALL OResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateLong( sal_Int32 /*columnIndex*/, sal_Int64 /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateLong( sal_Int32 /*columnIndex*/, sal_Int64 /*x*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XRowUpdate::updateLong", *this ); } -void SAL_CALL OResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateFloat( sal_Int32 columnIndex, float x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateDouble( sal_Int32 columnIndex, double x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateBytes( sal_Int32 columnIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateBytes( sal_Int32 columnIndex, const Sequence< sal_Int8 >& x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const css::util::Date& x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const css::util::Time& x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) { updateValue(columnIndex,x); } -void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) { ResultSetEntryGuard aGuard( *this ); @@ -1657,12 +1652,12 @@ void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Refer updateValue(columnIndex,aSeq); } -void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) { updateBinaryStream(columnIndex,x,length); } -void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) { if (!::dbtools::implUpdateObject(this, columnIndex, x)) { @@ -1675,7 +1670,7 @@ void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) th } -void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 /*scale*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 /*scale*/ ) { if (!::dbtools::implUpdateObject(this, columnIndex, x)) { @@ -1689,7 +1684,7 @@ void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& // XResultSetUpdate -void SAL_CALL OResultSet::insertRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL OResultSet::insertRow( ) { ResultSetEntryGuard aGuard( *this ); SAL_INFO("connectivity.mork", "in, m_nRowPos = " << m_nRowPos); @@ -1699,27 +1694,27 @@ void SAL_CALL OResultSet::insertRow( ) throw(css::sdbc::SQLException, css::uno: SAL_INFO("connectivity.mork", "out, m_nRowPos = " << m_nRowPos); } -void SAL_CALL OResultSet::updateRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL OResultSet::updateRow( ) { OSL_FAIL( "OResultSet::updateRow( ) not implemented" ); } -void SAL_CALL OResultSet::deleteRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL OResultSet::deleteRow( ) { OSL_FAIL( "OResultSet::deleteRow( ) not implemented" ); } -void SAL_CALL OResultSet::cancelRowUpdates( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL OResultSet::cancelRowUpdates( ) { OSL_FAIL( "OResultSet::cancelRowUpdates( ) not implemented" ); } -void SAL_CALL OResultSet::moveToInsertRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL OResultSet::moveToInsertRow( ) { OSL_FAIL( "OResultSet::moveToInsertRow( ) not implemented" ); } -void SAL_CALL OResultSet::moveToCurrentRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +void SAL_CALL OResultSet::moveToCurrentRow( ) { ResultSetEntryGuard aGuard( *this ); SAL_INFO("connectivity.mork", "m_nRowPos = " << m_nRowPos); @@ -1761,7 +1756,7 @@ void OResultSet::setOrderByAscending(const ::std::vector& _aOrd { m_aOrderbyAscending = _aOrderbyAsc; } -Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows( const Sequence< Any >& /*rows*/ ) throw(SQLException, RuntimeException, std::exception) +Sequence< sal_Int32 > SAL_CALL OResultSet::deleteRows( const Sequence< Any >& /*rows*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XDeleteRows::deleteRows", *this ); return Sequence< sal_Int32 >(); diff --git a/connectivity/source/drivers/mork/MResultSet.hxx b/connectivity/source/drivers/mork/MResultSet.hxx index 081352aba80a..c8fc79ef5104 100644 --- a/connectivity/source/drivers/mork/MResultSet.hxx +++ b/connectivity/source/drivers/mork/MResultSet.hxx @@ -97,13 +97,11 @@ namespace connectivity css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, - const css::uno::Any& rValue ) - throw (css::lang::IllegalArgumentException) override; + const css::uno::Any& rValue ) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const css::uno::Any& rValue - ) - throw (css::uno::Exception, std::exception) override; + ) override; virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle @@ -119,99 +117,99 @@ namespace connectivity // ::cppu::OComponentHelper virtual void SAL_CALL disposing() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; //XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; // XResultSet - virtual sal_Bool SAL_CALL next( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isBeforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAfterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL beforeFirst( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL afterLast( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL first( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL last( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL previous( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL refreshRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowUpdated( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowInserted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL rowDeleted( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL next( ) override; + virtual sal_Bool SAL_CALL isBeforeFirst( ) override; + virtual sal_Bool SAL_CALL isAfterLast( ) override; + virtual sal_Bool SAL_CALL isFirst( ) override; + virtual sal_Bool SAL_CALL isLast( ) override; + virtual void SAL_CALL beforeFirst( ) override; + virtual void SAL_CALL afterLast( ) override; + virtual sal_Bool SAL_CALL first( ) override; + virtual sal_Bool SAL_CALL last( ) override; + virtual sal_Int32 SAL_CALL getRow( ) override; + virtual sal_Bool SAL_CALL absolute( sal_Int32 row ) override; + virtual sal_Bool SAL_CALL relative( sal_Int32 rows ) override; + virtual sal_Bool SAL_CALL previous( ) override; + virtual void SAL_CALL refreshRow( ) override; + virtual sal_Bool SAL_CALL rowUpdated( ) override; + virtual sal_Bool SAL_CALL rowInserted( ) override; + virtual sal_Bool SAL_CALL rowDeleted( ) override; + virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getStatement( ) override; // XRow - virtual sal_Bool SAL_CALL wasNull( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Bool SAL_CALL wasNull( ) override; + virtual OUString SAL_CALL getString( sal_Int32 columnIndex ) override; + virtual sal_Bool SAL_CALL getBoolean( sal_Int32 columnIndex ) override; + virtual sal_Int8 SAL_CALL getByte( sal_Int32 columnIndex ) override; + virtual sal_Int16 SAL_CALL getShort( sal_Int32 columnIndex ) override; + virtual sal_Int32 SAL_CALL getInt( sal_Int32 columnIndex ) override; + virtual sal_Int64 SAL_CALL getLong( sal_Int32 columnIndex ) override; + virtual float SAL_CALL getFloat( sal_Int32 columnIndex ) override; + virtual double SAL_CALL getDouble( sal_Int32 columnIndex ) override; + virtual css::uno::Sequence< sal_Int8 > SAL_CALL getBytes( sal_Int32 columnIndex ) override; + virtual css::util::Date SAL_CALL getDate( sal_Int32 columnIndex ) override; + virtual css::util::Time SAL_CALL getTime( sal_Int32 columnIndex ) override; + virtual css::util::DateTime SAL_CALL getTimestamp( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getBinaryStream( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::io::XInputStream > SAL_CALL getCharacterStream( sal_Int32 columnIndex ) override; + virtual css::uno::Any SAL_CALL getObject( sal_Int32 columnIndex, const css::uno::Reference< css::container::XNameAccess >& typeMap ) override; + virtual css::uno::Reference< css::sdbc::XRef > SAL_CALL getRef( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XBlob > SAL_CALL getBlob( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XClob > SAL_CALL getClob( sal_Int32 columnIndex ) override; + virtual css::uno::Reference< css::sdbc::XArray > SAL_CALL getArray( sal_Int32 columnIndex ) override; // XResultSetMetaDataSupplier - virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::sdbc::XResultSetMetaData > SAL_CALL getMetaData( ) override; // XCancellable - virtual void SAL_CALL cancel( ) throw(css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL cancel( ) override; // XCloseable - virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) override; // XWarningsSupplier - virtual css::uno::Any SAL_CALL getWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getWarnings( ) override; + virtual void SAL_CALL clearWarnings( ) override; // XColumnLocate - virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual sal_Int32 SAL_CALL findColumn( const OUString& columnName ) override; // XResultSetUpdate - virtual void SAL_CALL insertRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL deleteRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL cancelRowUpdates( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL moveToInsertRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL moveToCurrentRow( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL insertRow( ) override; + virtual void SAL_CALL updateRow( ) override; + virtual void SAL_CALL deleteRow( ) override; + virtual void SAL_CALL cancelRowUpdates( ) override; + virtual void SAL_CALL moveToInsertRow( ) override; + virtual void SAL_CALL moveToCurrentRow( ) override; // XRowUpdate - virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL updateNull( sal_Int32 columnIndex ) override; + virtual void SAL_CALL updateBoolean( sal_Int32 columnIndex, sal_Bool x ) override; + virtual void SAL_CALL updateByte( sal_Int32 columnIndex, sal_Int8 x ) override; + virtual void SAL_CALL updateShort( sal_Int32 columnIndex, sal_Int16 x ) override; + virtual void SAL_CALL updateInt( sal_Int32 columnIndex, sal_Int32 x ) override; + virtual void SAL_CALL updateLong( sal_Int32 columnIndex, sal_Int64 x ) override; + virtual void SAL_CALL updateFloat( sal_Int32 columnIndex, float x ) override; + virtual void SAL_CALL updateDouble( sal_Int32 columnIndex, double x ) override; + virtual void SAL_CALL updateString( sal_Int32 columnIndex, const OUString& x ) override; + virtual void SAL_CALL updateBytes( sal_Int32 columnIndex, const css::uno::Sequence< sal_Int8 >& x ) override; + virtual void SAL_CALL updateDate( sal_Int32 columnIndex, const css::util::Date& x ) override; + virtual void SAL_CALL updateTime( sal_Int32 columnIndex, const css::util::Time& x ) override; + virtual void SAL_CALL updateTimestamp( sal_Int32 columnIndex, const css::util::DateTime& x ) override; + virtual void SAL_CALL updateBinaryStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL updateCharacterStream( sal_Int32 columnIndex, const css::uno::Reference< css::io::XInputStream >& x, sal_Int32 length ) override; + virtual void SAL_CALL updateObject( sal_Int32 columnIndex, const css::uno::Any& x ) override; + virtual void SAL_CALL updateNumericObject( sal_Int32 columnIndex, const css::uno::Any& x, sal_Int32 scale ) override; // XRowLocate - virtual css::uno::Any SAL_CALL getBookmark( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL hasOrderedBookmarks( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getBookmark( ) override; + virtual sal_Bool SAL_CALL moveToBookmark( const css::uno::Any& bookmark ) override; + virtual sal_Bool SAL_CALL moveRelativeToBookmark( const css::uno::Any& bookmark, sal_Int32 rows ) override; + virtual sal_Int32 SAL_CALL compareBookmarks( const css::uno::Any& first, const css::uno::Any& second ) override; + virtual sal_Bool SAL_CALL hasOrderedBookmarks( ) override; + virtual sal_Int32 SAL_CALL hashBookmark( const css::uno::Any& bookmark ) override; // XDeleteRows - virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const css::uno::Sequence< css::uno::Any >& rows ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< sal_Int32 > SAL_CALL deleteRows( const css::uno::Sequence< css::uno::Any >& rows ) override; protected: //MQuery m_aQuery; @@ -241,7 +239,7 @@ protected: void parseParameter( const OSQLParseNode* pNode, OUString& rMatchString ); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - void fillRowData() throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception); + void fillRowData(); void analyseWhereClause( const OSQLParseNode* parseTree, MQueryExpression &queryExpression); @@ -257,12 +255,10 @@ protected: /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - bool fetchRow(sal_Int32 rowIndex,bool bForceReload=false) throw( css::sdbc::SQLException, - css::uno::RuntimeException); + bool fetchRow(sal_Int32 rowIndex,bool bForceReload=false); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - bool fetchCurrentRow() throw( css::sdbc::SQLException, - css::uno::RuntimeException); + bool fetchCurrentRow(); static bool pushCard(sal_uInt32 ) { return true; } bool validRow( sal_uInt32 nRow ); bool seekRow( eRowPosition pos, sal_Int32 nOffset = 0 ); @@ -271,15 +267,14 @@ protected: sal_Int32 getRowForCardNumber(sal_Int32 nCardNum); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - const ORowSetValue& getValue(sal_Int32 rowIndex, sal_Int32 columnIndex) - throw(css::sdbc::SQLException, css::uno::RuntimeException); + const ORowSetValue& getValue(sal_Int32 rowIndex, sal_Int32 columnIndex); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - void updateValue(sal_Int32 columnIndex,const ORowSetValue& x ) throw(css::sdbc::SQLException, css::uno::RuntimeException); + void updateValue(sal_Int32 columnIndex,const ORowSetValue& x ); /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - static void checkPendingUpdate() throw(css::sdbc::SQLException, css::uno::RuntimeException); + static void checkPendingUpdate(); sal_Int32 getCurrentCardNumber(); public: @@ -287,9 +282,7 @@ public: // MozAddressbook Specific methods /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - void SAL_CALL executeQuery() throw(css::sdbc::SQLException, - css::uno::RuntimeException, - std::exception); + void SAL_CALL executeQuery(); void setTable(OTable* _rTable); @@ -311,7 +304,7 @@ public: inline sal_Int32 mapColumn(sal_Int32 column); /// @throws css::sdbc::SQLException - void checkIndex(sal_Int32 columnIndex ) throw(css::sdbc::SQLException); + void checkIndex(sal_Int32 columnIndex ); static void setBoundedColumns( const OValueRow& _rRow, diff --git a/connectivity/source/drivers/mork/MResultSetMetaData.cxx b/connectivity/source/drivers/mork/MResultSetMetaData.cxx index 24990110bb57..707e51f4dd2c 100644 --- a/connectivity/source/drivers/mork/MResultSetMetaData.cxx +++ b/connectivity/source/drivers/mork/MResultSetMetaData.cxx @@ -41,43 +41,43 @@ OResultSetMetaData::~OResultSetMetaData() } -void OResultSetMetaData::checkColumnIndex(sal_Int32 column) throw(SQLException, RuntimeException) +void OResultSetMetaData::checkColumnIndex(sal_Int32 column) { if(column <= 0 || column > (sal_Int32)(sal_Int32)m_xColumns->get().size()) throwInvalidIndexException(*this); } -sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) { return getPrecision(column); } -sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 /*column*/ ) { return DataType::VARCHAR; // at the moment there exists only this type } -sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount( ) { return static_cast((m_xColumns->get()).size()); } -sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 /*column*/ ) { return false; } -OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) { return OUString(); } -OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) { checkColumnIndex(column); @@ -94,71 +94,71 @@ OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQ return sColumnName; } -OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 /*column*/ ) { return m_aTableName; } -OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) { return OUString(); } -OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) { checkColumnIndex(column); return getString((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))); } -OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) { return getColumnName(column); } -OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) { return OUString(); } -sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) { checkColumnIndex(column); return getBOOL((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY))); } -sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 /*column*/ ) { return false; } -sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 /*column*/ ) { return false; } -sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) { checkColumnIndex(column); return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))); } -sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) { checkColumnIndex(column); return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))); } -sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) { checkColumnIndex(column); return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE))); } -sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 /*column*/ ) { if ( !m_pTable || !m_pTable->getConnection() ) { @@ -170,7 +170,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 /*column*/ ) throw } -sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) { checkColumnIndex(column); bool bReadOnly = (m_xColumns->get())[column-1]->getPropertySetInfo()->hasPropertyByName(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION)) && @@ -180,12 +180,12 @@ sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLEx } -sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) { return !isReadOnly(column); } -sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) { return !isReadOnly(column); } diff --git a/connectivity/source/drivers/mork/MResultSetMetaData.hxx b/connectivity/source/drivers/mork/MResultSetMetaData.hxx index 78db8d3f3bb9..1e057ef7773e 100644 --- a/connectivity/source/drivers/mork/MResultSetMetaData.hxx +++ b/connectivity/source/drivers/mork/MResultSetMetaData.hxx @@ -59,28 +59,28 @@ namespace connectivity /// @throws css::sdbc::SQLException /// @throws css::uno::RuntimeException - void checkColumnIndex(sal_Int32 column) throw(css::sdbc::SQLException, css::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getColumnCount( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getTableName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + void checkColumnIndex(sal_Int32 column); + virtual sal_Int32 SAL_CALL getColumnCount( ) override; + virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isSearchable( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isCurrency( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL isNullable( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isSigned( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getColumnDisplaySize( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnLabel( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnName( sal_Int32 column ) override; + virtual OUString SAL_CALL getSchemaName( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getPrecision( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getScale( sal_Int32 column ) override; + virtual OUString SAL_CALL getTableName( sal_Int32 column ) override; + virtual OUString SAL_CALL getCatalogName( sal_Int32 column ) override; + virtual sal_Int32 SAL_CALL getColumnType( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnTypeName( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isReadOnly( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isWritable( sal_Int32 column ) override; + virtual sal_Bool SAL_CALL isDefinitelyWritable( sal_Int32 column ) override; + virtual OUString SAL_CALL getColumnServiceName( sal_Int32 column ) override; }; } } diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx index 14be8ae4df35..7f9ed80eb17f 100644 --- a/connectivity/source/drivers/mork/MStatement.cxx +++ b/connectivity/source/drivers/mork/MStatement.cxx @@ -87,7 +87,7 @@ void OCommonStatement::disposing() OCommonStatement_IBASE::disposing(); } -Any SAL_CALL OCommonStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OCommonStatement::queryInterface( const Type & rType ) { Any aRet = OCommonStatement_IBASE::queryInterface(rType); if(!aRet.hasValue()) @@ -95,7 +95,7 @@ Any SAL_CALL OCommonStatement::queryInterface( const Type & rType ) throw(Runtim return aRet; } -Sequence< Type > SAL_CALL OCommonStatement::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL OCommonStatement::getTypes( ) { ::cppu::OTypeCollection aTypes( cppu::UnoType::get(), cppu::UnoType::get(), @@ -104,7 +104,7 @@ Sequence< Type > SAL_CALL OCommonStatement::getTypes( ) throw(RuntimeException, return ::comphelper::concatSequences(aTypes.getTypes(),OCommonStatement_IBASE::getTypes()); } -void SAL_CALL OCommonStatement::close( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OCommonStatement::close( ) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -114,7 +114,6 @@ void SAL_CALL OCommonStatement::close( ) throw(SQLException, RuntimeException, } OCommonStatement::StatementType OCommonStatement::parseSql( const OUString& sql , bool bAdjusted) - throw ( SQLException, RuntimeException, std::exception ) { OUString aErr; @@ -218,7 +217,7 @@ void OCommonStatement::cacheResultSet( const ::rtl::Reference< OResultSet >& _pR } -sal_Bool SAL_CALL OCommonStatement::execute( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OCommonStatement::execute( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed); @@ -229,7 +228,7 @@ sal_Bool SAL_CALL OCommonStatement::execute( const OUString& sql ) throw(SQLExce } -Reference< XResultSet > SAL_CALL OCommonStatement::executeQuery( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL OCommonStatement::executeQuery( const OUString& sql ) { ::osl::MutexGuard aGuard( m_ThreadMutex ); checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed); @@ -243,7 +242,7 @@ Reference< XResultSet > SAL_CALL OCommonStatement::executeQuery( const OUString& } -Reference< XConnection > SAL_CALL OCommonStatement::getConnection( ) throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > SAL_CALL OCommonStatement::getConnection( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed); @@ -252,7 +251,7 @@ Reference< XConnection > SAL_CALL OCommonStatement::getConnection( ) throw(SQLE return Reference< XConnection >(m_pConnection.get()); } -Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OStatement::queryInterface( const Type & rType ) { Any aRet = ::cppu::queryInterface(rType,static_cast< XServiceInfo*> (this)); if(!aRet.hasValue()) @@ -260,14 +259,14 @@ Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeExcep return aRet; } -sal_Int32 SAL_CALL OCommonStatement::executeUpdate( const OUString& /*sql*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OCommonStatement::executeUpdate( const OUString& /*sql*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XStatement::executeUpdate", *this ); return 0; } -Any SAL_CALL OCommonStatement::getWarnings( ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OCommonStatement::getWarnings( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed); @@ -276,7 +275,7 @@ Any SAL_CALL OCommonStatement::getWarnings( ) throw(SQLException, RuntimeExcept } -void SAL_CALL OCommonStatement::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OCommonStatement::clearWarnings( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed); @@ -325,14 +324,13 @@ sal_Bool OCommonStatement::convertFastPropertyValue( Any & /*rOldValue*/, sal_Int32 /*nHandle*/, const Any& /*rValue*/ ) - throw (css::lang::IllegalArgumentException) { bool bConverted = false; // here we have to try to convert return bConverted; } -void OCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& /*rValue*/) throw (Exception, std::exception) +void OCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& /*rValue*/) { // set the value to whatever is necessary switch(nHandle) @@ -389,7 +387,7 @@ void SAL_CALL OStatement::release() throw() OCommonStatement::release(); } -Reference< css::beans::XPropertySetInfo > SAL_CALL OCommonStatement::getPropertySetInfo( ) throw(RuntimeException, std::exception) +Reference< css::beans::XPropertySetInfo > SAL_CALL OCommonStatement::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } diff --git a/connectivity/source/drivers/mork/MStatement.hxx b/connectivity/source/drivers/mork/MStatement.hxx index 3127bbb20a4e..ec88e19e1199 100644 --- a/connectivity/source/drivers/mork/MStatement.hxx +++ b/connectivity/source/drivers/mork/MStatement.hxx @@ -88,11 +88,10 @@ namespace connectivity css::uno::Any & rConvertedValue, css::uno::Any & rOldValue, sal_Int32 nHandle, - const css::uno::Any& rValue ) - throw (css::lang::IllegalArgumentException) override; + const css::uno::Any& rValue ) override; virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const css::uno::Any& rValue) throw (css::uno::Exception, std::exception) override; + const css::uno::Any& rValue) override; virtual void SAL_CALL getFastPropertyValue( css::uno::Any& rValue, sal_Int32 nHandle) const override; @@ -109,7 +108,7 @@ namespace connectivity @throws css::uno::RuntimeException */ virtual StatementType - parseSql( const OUString& sql , bool bAdjusted = false) throw ( css::sdbc::SQLException, css::uno::RuntimeException, std::exception ); + parseSql( const OUString& sql , bool bAdjusted = false); /** called to initialize a result set, according to a previously parsed SQL statement */ virtual void initializeResultSet( OResultSet* _pResult ); @@ -145,22 +144,22 @@ namespace connectivity virtual void SAL_CALL release() throw() override; virtual void SAL_CALL acquire() throw() override; // XInterface - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; //XTypeProvider - virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes( ) override; // XPropertySet - virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) override; // XStatement - virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ; - virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ; - virtual sal_Bool SAL_CALL execute( const OUString& sql ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ; - virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override ; + virtual css::uno::Reference< css::sdbc::XResultSet > SAL_CALL executeQuery( const OUString& sql ) override ; + virtual sal_Int32 SAL_CALL executeUpdate( const OUString& sql ) override ; + virtual sal_Bool SAL_CALL execute( const OUString& sql ) override ; + virtual css::uno::Reference< css::sdbc::XConnection > SAL_CALL getConnection( ) override ; // XWarningsSupplier - virtual css::uno::Any SAL_CALL getWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; - virtual void SAL_CALL clearWarnings( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL getWarnings( ) override; + virtual void SAL_CALL clearWarnings( ) override; // XCloseable - virtual void SAL_CALL close( ) throw(css::sdbc::SQLException, css::uno::RuntimeException, std::exception) override; + virtual void SAL_CALL close( ) override; protected: using OPropertySetHelper::getFastPropertyValue; @@ -176,7 +175,7 @@ namespace connectivity explicit OStatement( OConnection* _pConnection); DECLARE_SERVICE_INFO(); - virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) throw(css::uno::RuntimeException, std::exception) override; + virtual css::uno::Any SAL_CALL queryInterface( const css::uno::Type & rType ) override; virtual void SAL_CALL acquire() throw() override; virtual void SAL_CALL release() throw() override; }; diff --git a/connectivity/source/drivers/mork/MTables.cxx b/connectivity/source/drivers/mork/MTables.cxx index a5164e426fe9..1bc3ad5f3d39 100644 --- a/connectivity/source/drivers/mork/MTables.cxx +++ b/connectivity/source/drivers/mork/MTables.cxx @@ -53,7 +53,7 @@ sdbcx::ObjectType OTables::createObject(const OUString& _rName) return xRet; } -void OTables::impl_refresh( ) throw(RuntimeException) +void OTables::impl_refresh( ) { static_cast(m_rParent).refreshTables(); } diff --git a/connectivity/source/drivers/mork/MTables.hxx b/connectivity/source/drivers/mork/MTables.hxx index 7a96a3d622fa..23a4b51361f6 100644 --- a/connectivity/source/drivers/mork/MTables.hxx +++ b/connectivity/source/drivers/mork/MTables.hxx @@ -30,7 +30,7 @@ namespace connectivity css::uno::Reference< css::sdbc::XDatabaseMetaData > m_xMetaData; protected: virtual sdbcx::ObjectType createObject(const OUString& _rName) override; - virtual void impl_refresh() throw(css::uno::RuntimeException) override; + virtual void impl_refresh() override; public: OTables(const css::uno::Reference< css::sdbc::XDatabaseMetaData >& _rMetaData,::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector) : sdbcx::OCollection(_rParent, true, _rMutex, _rVector) diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx index a1f073dd7dbb..505a23b1e376 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx @@ -70,17 +70,17 @@ void MozillaBootstrap::disposing() OMozillaBootstrap_BASE::disposing(); } -OUString SAL_CALL MozillaBootstrap::getImplementationName( ) throw(RuntimeException, std::exception) +OUString SAL_CALL MozillaBootstrap::getImplementationName( ) { return OUString(MOZAB_MozillaBootstrap_IMPL_NAME); } -sal_Bool SAL_CALL MozillaBootstrap::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL MozillaBootstrap::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } -Sequence< OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames( ) throw(RuntimeException, std::exception) +Sequence< OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames( ) { // which service is supported // for more information @see com.sun.star.mozilla.MozillaBootstrap @@ -89,55 +89,55 @@ Sequence< OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames( ) thr // XProfileDiscover -::sal_Int32 SAL_CALL MozillaBootstrap::getProfileCount( css::mozilla::MozillaProductType product) throw (css::uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL MozillaBootstrap::getProfileCount( css::mozilla::MozillaProductType product) { return m_ProfileAccess->getProfileCount(product); } -::sal_Int32 SAL_CALL MozillaBootstrap::getProfileList( css::mozilla::MozillaProductType product, css::uno::Sequence< OUString >& list ) throw (css::uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL MozillaBootstrap::getProfileList( css::mozilla::MozillaProductType product, css::uno::Sequence< OUString >& list ) { return m_ProfileAccess->getProfileList(product,list); } -OUString SAL_CALL MozillaBootstrap::getDefaultProfile( css::mozilla::MozillaProductType product ) throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL MozillaBootstrap::getDefaultProfile( css::mozilla::MozillaProductType product ) { return m_ProfileAccess->getDefaultProfile(product); } -OUString SAL_CALL MozillaBootstrap::getProfilePath( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL MozillaBootstrap::getProfilePath( css::mozilla::MozillaProductType product, const OUString& profileName ) { return m_ProfileAccess->getProfilePath(product,profileName); } -sal_Bool SAL_CALL MozillaBootstrap::isProfileLocked( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL MozillaBootstrap::isProfileLocked( css::mozilla::MozillaProductType product, const OUString& profileName ) { return m_ProfileAccess->isProfileLocked(product,profileName); } -sal_Bool SAL_CALL MozillaBootstrap::getProfileExists( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL MozillaBootstrap::getProfileExists( css::mozilla::MozillaProductType product, const OUString& profileName ) { return m_ProfileAccess->getProfileExists(product,profileName); } // XProfileManager -::sal_Int32 SAL_CALL MozillaBootstrap::bootupProfile( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL MozillaBootstrap::bootupProfile( css::mozilla::MozillaProductType product, const OUString& profileName ) { (void)product; /* avoid warning about unused parameter */ (void)profileName; /* avoid warning about unused parameter */ return -1; } -::sal_Int32 SAL_CALL MozillaBootstrap::shutdownProfile( ) throw (css::uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL MozillaBootstrap::shutdownProfile( ) { return -1; } -css::mozilla::MozillaProductType SAL_CALL MozillaBootstrap::getCurrentProduct( ) throw (css::uno::RuntimeException, std::exception) +css::mozilla::MozillaProductType SAL_CALL MozillaBootstrap::getCurrentProduct( ) { return css::mozilla::MozillaProductType_Default; } -OUString SAL_CALL MozillaBootstrap::getCurrentProfile( ) throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL MozillaBootstrap::getCurrentProfile( ) { return OUString(); } -sal_Bool SAL_CALL MozillaBootstrap::isCurrentProfileLocked( ) throw (css::uno::RuntimeException, std::exception) +sal_Bool SAL_CALL MozillaBootstrap::isCurrentProfileLocked( ) { return true; } -OUString SAL_CALL MozillaBootstrap::setCurrentProfile( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException, std::exception) +OUString SAL_CALL MozillaBootstrap::setCurrentProfile( css::mozilla::MozillaProductType product, const OUString& profileName ) { (void)product; /* avoid warning about unused parameter */ (void)profileName; /* avoid warning about unused parameter */ @@ -145,7 +145,7 @@ OUString SAL_CALL MozillaBootstrap::setCurrentProfile( css::mozilla::MozillaProd } // XProxyRunner -::sal_Int32 SAL_CALL MozillaBootstrap::Run( const css::uno::Reference< css::mozilla::XCodeProxy >& aCode ) throw (css::uno::RuntimeException, std::exception) +::sal_Int32 SAL_CALL MozillaBootstrap::Run( const css::uno::Reference< css::mozilla::XCodeProxy >& aCode ) { (void)aCode; /* avoid warning about unused parameter */ return -1; diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx index 2a61d88d760b..9c75568e203f 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx @@ -51,30 +51,30 @@ namespace connectivity virtual void SAL_CALL disposing() override; // XServiceInfo - virtual OUString SAL_CALL getImplementationName( ) throw(css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw(css::uno::RuntimeException, std::exception) override; - virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw(css::uno::RuntimeException, std::exception) override; + virtual OUString SAL_CALL getImplementationName( ) override; + virtual sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) override; // XMozillaBootstrap // XProfileDiscover - virtual ::sal_Int32 SAL_CALL getProfileCount( css::mozilla::MozillaProductType product) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL getProfileList( css::mozilla::MozillaProductType product, css::uno::Sequence< OUString >& list ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getDefaultProfile( css::mozilla::MozillaProductType product ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getProfilePath( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isProfileLocked( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL getProfileExists( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL getProfileCount( css::mozilla::MozillaProductType product) override; + virtual ::sal_Int32 SAL_CALL getProfileList( css::mozilla::MozillaProductType product, css::uno::Sequence< OUString >& list ) override; + virtual OUString SAL_CALL getDefaultProfile( css::mozilla::MozillaProductType product ) override; + virtual OUString SAL_CALL getProfilePath( css::mozilla::MozillaProductType product, const OUString& profileName ) override; + virtual sal_Bool SAL_CALL isProfileLocked( css::mozilla::MozillaProductType product, const OUString& profileName ) override; + virtual sal_Bool SAL_CALL getProfileExists( css::mozilla::MozillaProductType product, const OUString& profileName ) override; // XProfileManager - virtual ::sal_Int32 SAL_CALL bootupProfile( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException, std::exception) override; - virtual ::sal_Int32 SAL_CALL shutdownProfile( ) throw (css::uno::RuntimeException, std::exception) override; - virtual css::mozilla::MozillaProductType SAL_CALL getCurrentProduct( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL getCurrentProfile( ) throw (css::uno::RuntimeException, std::exception) override; - virtual sal_Bool SAL_CALL isCurrentProfileLocked( ) throw (css::uno::RuntimeException, std::exception) override; - virtual OUString SAL_CALL setCurrentProfile( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL bootupProfile( css::mozilla::MozillaProductType product, const OUString& profileName ) override; + virtual ::sal_Int32 SAL_CALL shutdownProfile( ) override; + virtual css::mozilla::MozillaProductType SAL_CALL getCurrentProduct( ) override; + virtual OUString SAL_CALL getCurrentProfile( ) override; + virtual sal_Bool SAL_CALL isCurrentProfileLocked( ) override; + virtual OUString SAL_CALL setCurrentProfile( css::mozilla::MozillaProductType product, const OUString& profileName ) override; // XProxyRunner - virtual ::sal_Int32 SAL_CALL Run( const css::uno::Reference< css::mozilla::XCodeProxy >& aCode ) throw (css::uno::RuntimeException, std::exception) override; + virtual ::sal_Int32 SAL_CALL Run( const css::uno::Reference< css::mozilla::XCodeProxy >& aCode ) override; }; } diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx index f859727eef3b..15f1dd1264b6 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx @@ -21,7 +21,7 @@ #include #include -IniParser::IniParser(OUString const & rIniName) throw(css::io::IOException, std::exception) +IniParser::IniParser(OUString const & rIniName) { OUString iniUrl; if (osl_File_E_None != osl_getFileURLFromSystemPath(rIniName.pData, &iniUrl.pData)) diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx index 9b44ffb2091b..120f47121915 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx @@ -52,7 +52,7 @@ class IniParser public: IniSectionMap& getAllSection() { return mAllSection; } /// @throws css::io::IOException - explicit IniParser(OUString const & rIniName) throw(css::io::IOException, std::exception); + explicit IniParser(OUString const & rIniName); }; #endif diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx index 9f4ca1c9c1c2..1adb8993fde0 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx @@ -139,7 +139,7 @@ namespace connectivity } } - OUString ProfileAccess::getProfilePath( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException) + OUString ProfileAccess::getProfilePath( css::mozilla::MozillaProductType product, const OUString& profileName ) { sal_Int32 index=product; ProductStruct &rProduct = m_ProductProfileList[index]; @@ -152,13 +152,13 @@ namespace connectivity return rProduct.mProfileList[profileName]->getProfilePath(); } - ::sal_Int32 ProfileAccess::getProfileCount( css::mozilla::MozillaProductType product) throw (css::uno::RuntimeException) + ::sal_Int32 ProfileAccess::getProfileCount( css::mozilla::MozillaProductType product) { sal_Int32 index=product; ProductStruct &rProduct = m_ProductProfileList[index]; return static_cast< ::sal_Int32 >(rProduct.mProfileList.size()); } - ::sal_Int32 ProfileAccess::getProfileList( css::mozilla::MozillaProductType product, css::uno::Sequence< OUString >& list ) throw (css::uno::RuntimeException) + ::sal_Int32 ProfileAccess::getProfileList( css::mozilla::MozillaProductType product, css::uno::Sequence< OUString >& list ) { sal_Int32 index=product; ProductStruct &rProduct = m_ProductProfileList[index]; @@ -176,7 +176,7 @@ namespace connectivity return static_cast< ::sal_Int32 >(rProduct.mProfileList.size()); } - OUString ProfileAccess::getDefaultProfile( css::mozilla::MozillaProductType product ) throw (css::uno::RuntimeException) + OUString ProfileAccess::getDefaultProfile( css::mozilla::MozillaProductType product ) { sal_Int32 index=product; ProductStruct &rProduct = m_ProductProfileList[index]; @@ -193,14 +193,14 @@ namespace connectivity ProfileStruct * aProfile = (*rProduct.mProfileList.begin()).second; return aProfile->getProfileName(); } - bool ProfileAccess::isProfileLocked( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException) + bool ProfileAccess::isProfileLocked( css::mozilla::MozillaProductType product, const OUString& profileName ) { (void)product; /* avoid warning about unused parameter */ (void)profileName; /* avoid warning about unused parameter */ return true; } - bool ProfileAccess::getProfileExists( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException) + bool ProfileAccess::getProfileExists( css::mozilla::MozillaProductType product, const OUString& profileName ) { sal_Int32 index=product; ProductStruct &rProduct = m_ProductProfileList[index]; diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx index 8de3f03d8e6b..8bd1021bf343 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx @@ -71,17 +71,17 @@ namespace connectivity ~ProfileAccess(); ProfileAccess(); /// @throws css::uno::RuntimeException - OUString getProfilePath( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException); + OUString getProfilePath( css::mozilla::MozillaProductType product, const OUString& profileName ); /// @throws css::uno::RuntimeException - ::sal_Int32 getProfileCount( css::mozilla::MozillaProductType product ) throw (css::uno::RuntimeException); + ::sal_Int32 getProfileCount( css::mozilla::MozillaProductType product ); /// @throws css::uno::RuntimeException - ::sal_Int32 getProfileList( css::mozilla::MozillaProductType product, css::uno::Sequence< OUString >& list ) throw (css::uno::RuntimeException); + ::sal_Int32 getProfileList( css::mozilla::MozillaProductType product, css::uno::Sequence< OUString >& list ); /// @throws css::uno::RuntimeException - OUString getDefaultProfile( css::mozilla::MozillaProductType product ) throw (css::uno::RuntimeException); + OUString getDefaultProfile( css::mozilla::MozillaProductType product ); /// @throws css::uno::RuntimeException - bool SAL_CALL isProfileLocked( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException); + bool SAL_CALL isProfileLocked( css::mozilla::MozillaProductType product, const OUString& profileName ); /// @throws css::uno::RuntimeException - bool SAL_CALL getProfileExists( css::mozilla::MozillaProductType product, const OUString& profileName ) throw (css::uno::RuntimeException); + bool SAL_CALL getProfileExists( css::mozilla::MozillaProductType product, const OUString& profileName ); private: ProductStruct m_ProductProfileList[4]; void LoadProductsInfo(); diff --git a/connectivity/source/drivers/mysql/YCatalog.cxx b/connectivity/source/drivers/mysql/YCatalog.cxx index c98890c5f6d3..6d9e1c1b865c 100644 --- a/connectivity/source/drivers/mysql/YCatalog.cxx +++ b/connectivity/source/drivers/mysql/YCatalog.cxx @@ -112,7 +112,7 @@ void OMySQLCatalog::refreshUsers() m_pUsers = new OUsers(*this,m_aMutex,aVector,m_xConnection,this); } -Any SAL_CALL OMySQLCatalog::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OMySQLCatalog::queryInterface( const Type & rType ) { if ( rType == cppu::UnoType::get()) return Any(); @@ -121,7 +121,7 @@ Any SAL_CALL OMySQLCatalog::queryInterface( const Type & rType ) throw(RuntimeEx return OCatalog::queryInterface(rType); } -Sequence< Type > SAL_CALL OMySQLCatalog::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL OMySQLCatalog::getTypes( ) { Sequence< Type > aTypes = OCatalog::getTypes(); ::std::vector aOwnTypes; diff --git a/connectivity/source/drivers/mysql/YColumns.cxx b/connectivity/source/drivers/mysql/YColumns.cxx index 2864f5b92231..d8e0b75e3ce7 100644 --- a/connectivity/source/drivers/mysql/YColumns.cxx +++ b/connectivity/source/drivers/mysql/YColumns.cxx @@ -67,7 +67,7 @@ void OMySQLColumn::construct() return *OMySQLColumn_PROP::getArrayHelper(isNew() ? 1 : 0); } -Sequence< OUString > SAL_CALL OMySQLColumn::getSupportedServiceNames( ) throw(RuntimeException, std::exception) +Sequence< OUString > SAL_CALL OMySQLColumn::getSupportedServiceNames( ) { Sequence< OUString > aSupported { "com.sun.star.sdbcx.Column" }; diff --git a/connectivity/source/drivers/mysql/YDriver.cxx b/connectivity/source/drivers/mysql/YDriver.cxx index 3655fa4f5a3d..491dd7a0d72e 100644 --- a/connectivity/source/drivers/mysql/YDriver.cxx +++ b/connectivity/source/drivers/mysql/YDriver.cxx @@ -44,7 +44,7 @@ namespace connectivity namespace mysql { - Reference< XInterface > SAL_CALL ODriverDelegator_CreateInstance(const Reference< css::lang::XMultiServiceFactory >& _rxFac) throw( Exception ) + Reference< XInterface > SAL_CALL ODriverDelegator_CreateInstance(const Reference< css::lang::XMultiServiceFactory >& _rxFac) { return *(new ODriverDelegator( comphelper::getComponentContext(_rxFac) )); } @@ -248,7 +248,7 @@ namespace connectivity } - Reference< XConnection > SAL_CALL ODriverDelegator::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException, std::exception) + Reference< XConnection > SAL_CALL ODriverDelegator::connect( const OUString& url, const Sequence< PropertyValue >& info ) { Reference< XConnection > xConnection; if ( acceptsURL(url) ) @@ -310,7 +310,7 @@ namespace connectivity } - sal_Bool SAL_CALL ODriverDelegator::acceptsURL( const OUString& url ) throw (SQLException, RuntimeException, std::exception) + sal_Bool SAL_CALL ODriverDelegator::acceptsURL( const OUString& url ) { Sequence< PropertyValue > info; @@ -323,7 +323,7 @@ namespace connectivity } - Sequence< DriverPropertyInfo > SAL_CALL ODriverDelegator::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException, std::exception) + Sequence< DriverPropertyInfo > SAL_CALL ODriverDelegator::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& info ) { ::std::vector< DriverPropertyInfo > aDriverInfo; if ( !acceptsURL(url) ) @@ -381,19 +381,19 @@ namespace connectivity } - sal_Int32 SAL_CALL ODriverDelegator::getMajorVersion( ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL ODriverDelegator::getMajorVersion( ) { return 1; } - sal_Int32 SAL_CALL ODriverDelegator::getMinorVersion( ) throw (RuntimeException, std::exception) + sal_Int32 SAL_CALL ODriverDelegator::getMinorVersion( ) { return 0; } - Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByConnection( const Reference< XConnection >& connection ) throw (SQLException, RuntimeException, std::exception) + Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByConnection( const Reference< XConnection >& connection ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(ODriverDelegator_BASE::rBHelper.bDisposed); @@ -443,7 +443,7 @@ namespace connectivity } - Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) throw (SQLException, RuntimeException, std::exception) + Reference< XTablesSupplier > SAL_CALL ODriverDelegator::getDataDefinitionByURL( const OUString& url, const Sequence< PropertyValue >& info ) { if ( ! acceptsURL(url) ) { @@ -458,12 +458,12 @@ namespace connectivity // XServiceInfo - OUString ODriverDelegator::getImplementationName_Static( ) throw(RuntimeException) + OUString ODriverDelegator::getImplementationName_Static( ) { return OUString("org.openoffice.comp.drivers.MySQL.Driver"); } - Sequence< OUString > ODriverDelegator::getSupportedServiceNames_Static( ) throw (RuntimeException) + Sequence< OUString > ODriverDelegator::getSupportedServiceNames_Static( ) { Sequence< OUString > aSNS( 2 ); aSNS[0] = "com.sun.star.sdbc.Driver"; @@ -471,17 +471,17 @@ namespace connectivity return aSNS; } - OUString SAL_CALL ODriverDelegator::getImplementationName( ) throw(RuntimeException, std::exception) + OUString SAL_CALL ODriverDelegator::getImplementationName( ) { return getImplementationName_Static(); } - sal_Bool SAL_CALL ODriverDelegator::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) + sal_Bool SAL_CALL ODriverDelegator::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } - Sequence< OUString > SAL_CALL ODriverDelegator::getSupportedServiceNames( ) throw(RuntimeException, std::exception) + Sequence< OUString > SAL_CALL ODriverDelegator::getSupportedServiceNames( ) { return getSupportedServiceNames_Static(); } diff --git a/connectivity/source/drivers/mysql/YTable.cxx b/connectivity/source/drivers/mysql/YTable.cxx index 667e48af3c89..a83c82639559 100644 --- a/connectivity/source/drivers/mysql/YTable.cxx +++ b/connectivity/source/drivers/mysql/YTable.cxx @@ -162,7 +162,7 @@ Sequence< sal_Int8 > OMySQLTable::getUnoTunnelImplementationId() // css::lang::XUnoTunnel -sal_Int64 OMySQLTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (RuntimeException, std::exception) +sal_Int64 OMySQLTable::getSomething( const Sequence< sal_Int8 > & rId ) { return (rId.getLength() == 16 && 0 == memcmp(getUnoTunnelImplementationId().getConstArray(), rId.getConstArray(), 16 ) ) ? reinterpret_cast< sal_Int64 >( this ) @@ -170,7 +170,7 @@ sal_Int64 OMySQLTable::getSomething( const Sequence< sal_Int8 > & rId ) throw (R } // XAlterTable -void SAL_CALL OMySQLTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) throw(SQLException, NoSuchElementException, RuntimeException, std::exception) +void SAL_CALL OMySQLTable::alterColumnByName( const OUString& colName, const Reference< XPropertySet >& descriptor ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed( diff --git a/connectivity/source/drivers/mysql/YTables.cxx b/connectivity/source/drivers/mysql/YTables.cxx index 3cad5360c033..a05bb0028873 100644 --- a/connectivity/source/drivers/mysql/YTables.cxx +++ b/connectivity/source/drivers/mysql/YTables.cxx @@ -93,7 +93,7 @@ sdbcx::ObjectType OTables::createObject(const OUString& _rName) return xRet; } -void OTables::impl_refresh( ) throw(RuntimeException) +void OTables::impl_refresh( ) { static_cast(m_rParent).refreshTables(); } diff --git a/connectivity/source/drivers/mysql/YUser.cxx b/connectivity/source/drivers/mysql/YUser.cxx index e386d9b385ed..977b5bb0ea50 100644 --- a/connectivity/source/drivers/mysql/YUser.cxx +++ b/connectivity/source/drivers/mysql/YUser.cxx @@ -77,7 +77,7 @@ cppu::IPropertyArrayHelper & OUserExtend::getInfoHelper() } typedef connectivity::sdbcx::OUser_BASE OUser_BASE_RBHELPER; -sal_Int32 SAL_CALL OMySQLUser::getPrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OMySQLUser::getPrivileges( const OUString& objName, sal_Int32 objType ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed); @@ -87,7 +87,7 @@ sal_Int32 SAL_CALL OMySQLUser::getPrivileges( const OUString& objName, sal_Int32 return nRights; } -void OMySQLUser::findPrivilegesAndGrantPrivileges(const OUString& objName, sal_Int32 objType,sal_Int32& nRights,sal_Int32& nRightsWithGrant) throw(SQLException, RuntimeException) +void OMySQLUser::findPrivilegesAndGrantPrivileges(const OUString& objName, sal_Int32 objType,sal_Int32& nRights,sal_Int32& nRightsWithGrant) { nRightsWithGrant = nRights = 0; // first we need to create the sql stmt to select the privs @@ -192,7 +192,7 @@ void OMySQLUser::findPrivilegesAndGrantPrivileges(const OUString& objName, sal_I } } -sal_Int32 SAL_CALL OMySQLUser::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OMySQLUser::getGrantablePrivileges( const OUString& objName, sal_Int32 objType ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed); @@ -202,7 +202,7 @@ sal_Int32 SAL_CALL OMySQLUser::getGrantablePrivileges( const OUString& objName, return nRightsWithGrant; } -void SAL_CALL OMySQLUser::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OMySQLUser::grantPrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) { if ( objType != PrivilegeObject::TABLE ) { @@ -228,7 +228,7 @@ void SAL_CALL OMySQLUser::grantPrivileges( const OUString& objName, sal_Int32 ob } } -void SAL_CALL OMySQLUser::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OMySQLUser::revokePrivileges( const OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) { if ( objType != PrivilegeObject::TABLE ) { @@ -255,7 +255,7 @@ void SAL_CALL OMySQLUser::revokePrivileges( const OUString& objName, sal_Int32 o } // XUser -void SAL_CALL OMySQLUser::changePassword( const OUString& /*oldPassword*/, const OUString& newPassword ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OMySQLUser::changePassword( const OUString& /*oldPassword*/, const OUString& newPassword ) { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed); diff --git a/connectivity/source/drivers/mysql/YUsers.cxx b/connectivity/source/drivers/mysql/YUsers.cxx index 834c9461ff9a..db24a1d38976 100644 --- a/connectivity/source/drivers/mysql/YUsers.cxx +++ b/connectivity/source/drivers/mysql/YUsers.cxx @@ -54,7 +54,7 @@ sdbcx::ObjectType OUsers::createObject(const OUString& _rName) return new OMySQLUser(m_xConnection,_rName); } -void OUsers::impl_refresh() throw(RuntimeException) +void OUsers::impl_refresh() { m_pParent->refreshUsers(); } diff --git a/connectivity/source/drivers/mysql/YViews.cxx b/connectivity/source/drivers/mysql/YViews.cxx index 0e45831c7ad2..db8619d7e287 100644 --- a/connectivity/source/drivers/mysql/YViews.cxx +++ b/connectivity/source/drivers/mysql/YViews.cxx @@ -66,7 +66,7 @@ sdbcx::ObjectType OViews::createObject(const OUString& _rName) ); } -void OViews::impl_refresh( ) throw(RuntimeException) +void OViews::impl_refresh( ) { static_cast(m_rParent).refreshTables(); } diff --git a/connectivity/source/drivers/odbc/OConnection.cxx b/connectivity/source/drivers/odbc/OConnection.cxx index 9e0b3d1eb374..eb8d58547650 100644 --- a/connectivity/source/drivers/odbc/OConnection.cxx +++ b/connectivity/source/drivers/odbc/OConnection.cxx @@ -176,7 +176,7 @@ SQLRETURN OConnection::OpenConnection(const OUString& aConnectStr, sal_Int32 nTi return nSQLRETURN; } -SQLRETURN OConnection::Construct(const OUString& url,const Sequence< PropertyValue >& info) throw(SQLException, std::exception) +SQLRETURN OConnection::Construct(const OUString& url,const Sequence< PropertyValue >& info) { m_aConnectionHandle = SQL_NULL_HANDLE; m_sURL = url; @@ -268,7 +268,7 @@ SQLRETURN OConnection::Construct(const OUString& url,const Sequence< PropertyVal IMPLEMENT_SERVICE_INFO(OConnection, "com.sun.star.sdbc.drivers.odbc.OConnection", "com.sun.star.sdbc.Connection") -Reference< XStatement > SAL_CALL OConnection::createStatement( ) throw(SQLException, RuntimeException, std::exception) +Reference< XStatement > SAL_CALL OConnection::createStatement( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -278,7 +278,7 @@ Reference< XStatement > SAL_CALL OConnection::createStatement( ) throw(SQLExcep return xReturn; } -Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -288,13 +288,13 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OU return xReturn; } -Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& /*sql*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& /*sql*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::prepareCall", *this ); return nullptr; } -OUString SAL_CALL OConnection::nativeSQL( const OUString& sql ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OConnection::nativeSQL( const OUString& sql ) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -305,7 +305,7 @@ OUString SAL_CALL OConnection::nativeSQL( const OUString& sql ) throw(SQLExcepti return OUString(pOut,nOutLen,getTextEncoding()); } -void SAL_CALL OConnection::setAutoCommit( sal_Bool autoCommit ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::setAutoCommit( sal_Bool autoCommit ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -317,7 +317,7 @@ void SAL_CALL OConnection::setAutoCommit( sal_Bool autoCommit ) throw(SQLExcepti m_aConnectionHandle,SQL_HANDLE_DBC,*this); } -sal_Bool SAL_CALL OConnection::getAutoCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OConnection::getAutoCommit( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -329,7 +329,7 @@ sal_Bool SAL_CALL OConnection::getAutoCommit( ) throw(SQLException, RuntimeExce return nOption == SQL_AUTOCOMMIT_ON ; } -void SAL_CALL OConnection::commit( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::commit( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -338,7 +338,7 @@ void SAL_CALL OConnection::commit( ) throw(SQLException, RuntimeException, std: OTools::ThrowException(this,N3SQLEndTran(SQL_HANDLE_DBC,m_aConnectionHandle,SQL_COMMIT),m_aConnectionHandle,SQL_HANDLE_DBC,*this); } -void SAL_CALL OConnection::rollback( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::rollback( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -347,14 +347,14 @@ void SAL_CALL OConnection::rollback( ) throw(SQLException, RuntimeException, st OTools::ThrowException(this,N3SQLEndTran(SQL_HANDLE_DBC,m_aConnectionHandle,SQL_ROLLBACK),m_aConnectionHandle,SQL_HANDLE_DBC,*this); } -sal_Bool SAL_CALL OConnection::isClosed( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OConnection::isClosed( ) { ::osl::MutexGuard aGuard( m_aMutex ); return OConnection_BASE::rBHelper.bDisposed; } -Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -369,7 +369,7 @@ Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData( ) throw(SQLEx return xMetaData; } -void SAL_CALL OConnection::setReadOnly( sal_Bool readOnly ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::setReadOnly( sal_Bool readOnly ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -380,13 +380,13 @@ void SAL_CALL OConnection::setReadOnly( sal_Bool readOnly ) throw(SQLException, m_aConnectionHandle,SQL_HANDLE_DBC,*this); } -sal_Bool SAL_CALL OConnection::isReadOnly() throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OConnection::isReadOnly() { // const member which will initialized only once return m_bReadOnly; } -void SAL_CALL OConnection::setCatalog( const OUString& catalog ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::setCatalog( const OUString& catalog ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -398,7 +398,7 @@ void SAL_CALL OConnection::setCatalog( const OUString& catalog ) throw(SQLExcept m_aConnectionHandle,SQL_HANDLE_DBC,*this); } -OUString SAL_CALL OConnection::getCatalog( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL OConnection::getCatalog( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -413,7 +413,7 @@ OUString SAL_CALL OConnection::getCatalog( ) throw(SQLException, RuntimeExcepti return OUString(pCat,nValueLen,getTextEncoding()); } -void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 level ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 level ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -425,7 +425,7 @@ void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 level ) throw(SQLE m_aConnectionHandle,SQL_HANDLE_DBC,*this); } -sal_Int32 SAL_CALL OConnection::getTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OConnection::getTransactionIsolation( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -439,7 +439,7 @@ sal_Int32 SAL_CALL OConnection::getTransactionIsolation( ) throw(SQLException, return nTxn; } -Reference< css::container::XNameAccess > SAL_CALL OConnection::getTypeMap( ) throw(SQLException, RuntimeException, std::exception) +Reference< css::container::XNameAccess > SAL_CALL OConnection::getTypeMap( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OConnection_BASE::rBHelper.bDisposed); @@ -448,13 +448,13 @@ Reference< css::container::XNameAccess > SAL_CALL OConnection::getTypeMap( ) th return nullptr; } -void SAL_CALL OConnection::setTypeMap( const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::setTypeMap( const Reference< css::container::XNameAccess >& /*typeMap*/ ) { ::dbtools::throwFeatureNotImplementedSQLException( "XConnection::setTypeMap", *this ); } // XCloseable -void SAL_CALL OConnection::close( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::close( ) { { ::osl::MutexGuard aGuard( m_aMutex ); @@ -465,12 +465,12 @@ void SAL_CALL OConnection::close( ) throw(SQLException, RuntimeException, std:: } // XWarningsSupplier -Any SAL_CALL OConnection::getWarnings( ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OConnection::getWarnings( ) { return Any(); } -void SAL_CALL OConnection::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OConnection::clearWarnings( ) { } diff --git a/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx b/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx index 65336c2095a2..2fe1f8bfeedc 100644 --- a/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx +++ b/connectivity/source/drivers/odbc/ODatabaseMetaData.cxx @@ -81,7 +81,7 @@ Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw( ) return xRef; } -Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCatalogs( ) { Reference< XResultSet > xRef; if(!m_bUseCatalog) @@ -114,7 +114,7 @@ OUString ODatabaseMetaData::impl_getCatalogSeparator_throw( ) return aVal; } -Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas( ) { Reference< XResultSet > xRef; try @@ -132,7 +132,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getSchemas( ) throw(SQLExce Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges( const Any& catalog, const OUString& schema, const OUString& table, - const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception) + const OUString& columnNamePattern ) { Reference< XResultSet > xRef; try @@ -150,7 +150,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumnPrivileges( Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, - const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception) + const OUString& columnNamePattern ) { Reference< XResultSet > xRef; try @@ -168,7 +168,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( const Any& catalog, const OUString& schemaPattern, - const OUString& tableNamePattern, const Sequence< OUString >& types ) throw(SQLException, RuntimeException, std::exception) + const OUString& tableNamePattern, const Sequence< OUString >& types ) { Reference< XResultSet > xRef; try @@ -186,7 +186,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns( const Any& catalog, const OUString& schemaPattern, - const OUString& procedureNamePattern, const OUString& columnNamePattern ) throw(SQLException, RuntimeException, std::exception) + const OUString& procedureNamePattern, const OUString& columnNamePattern ) { Reference< XResultSet > xRef; try @@ -204,7 +204,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedureColumns( Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures( const Any& catalog, const OUString& schemaPattern, - const OUString& procedureNamePattern ) throw(SQLException, RuntimeException, std::exception) + const OUString& procedureNamePattern ) { Reference< XResultSet > xRef; try @@ -221,7 +221,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getProcedures( } Reference< XResultSet > SAL_CALL ODatabaseMetaData::getVersionColumns( - const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException, std::exception) + const Any& catalog, const OUString& schema, const OUString& table ) { Reference< XResultSet > xRef; bool bSuccess = false; @@ -247,77 +247,77 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getVersionColumns( return xRef; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_BINARY_LITERAL_LEN,nValue,*this); return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_ROW_SIZE,nValue,*this); return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_CATALOG_NAME_LEN,nValue,*this); return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_CHAR_LITERAL_LEN,nValue,*this); return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_COLUMN_NAME_LEN,nValue,*this); return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_COLUMNS_IN_INDEX,nValue,*this); return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_CURSOR_NAME_LEN,nValue,*this); return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_DRIVER_CONNECTIONS/*SQL_ACTIVE_CONNECTIONS*/,nValue,*this); return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_COLUMNS_IN_TABLE,nValue,*this); return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_STATEMENT_LEN,nValue,*this); return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_TABLE_NAME_LEN,nValue,*this); @@ -332,7 +332,7 @@ sal_Int32 ODatabaseMetaData::impl_getMaxTablesInSelect_throw( ) } Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys( - const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException, std::exception) + const Any& catalog, const OUString& schema, const OUString& table ) { Reference< XResultSet > xRef; try @@ -349,7 +349,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getExportedKeys( } Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys( - const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException, std::exception) + const Any& catalog, const OUString& schema, const OUString& table ) { Reference< XResultSet > xRef; try @@ -366,7 +366,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getImportedKeys( } Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys( - const Any& catalog, const OUString& schema, const OUString& table ) throw(SQLException, RuntimeException, std::exception) + const Any& catalog, const OUString& schema, const OUString& table ) { Reference< XResultSet > xRef; try @@ -384,7 +384,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getPrimaryKeys( Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo( const Any& catalog, const OUString& schema, const OUString& table, - sal_Bool unique, sal_Bool approximate ) throw(SQLException, RuntimeException, std::exception) + sal_Bool unique, sal_Bool approximate ) { Reference< XResultSet > xRef; try @@ -402,7 +402,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getIndexInfo( Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier( const Any& catalog, const OUString& schema, const OUString& table, sal_Int32 scope, - sal_Bool nullable ) throw(SQLException, RuntimeException, std::exception) + sal_Bool nullable ) { Reference< XResultSet > xRef; try @@ -419,7 +419,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getBestRowIdentifier( } Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( - const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) throw(SQLException, RuntimeException, std::exception) + const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern ) { if ( m_pConnection->isIgnoreDriverPrivilegesEnabled() ) { @@ -434,7 +434,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference( const Any& primaryCatalog, const OUString& primarySchema, const OUString& primaryTable, const Any& foreignCatalog, - const OUString& foreignSchema, const OUString& foreignTable ) throw(SQLException, RuntimeException, std::exception) + const OUString& foreignSchema, const OUString& foreignTable ) { Reference< XResultSet > xRef; try @@ -451,21 +451,21 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getCrossReference( return xRef; } -sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) { OUString aVal; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_ROW_SIZE_INCLUDES_LONG,aVal,*this,m_pConnection->getTextEncoding()); return aVal.toChar() == 'Y'; } -sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_QUOTED_IDENTIFIER_CASE,nValue,*this); return nValue == SQL_IC_LOWER; } -sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_IDENTIFIER_CASE,nValue,*this); @@ -479,21 +479,21 @@ bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) return nValue == SQL_IC_MIXED; } -sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_IDENTIFIER_CASE,nValue,*this); return nValue == SQL_IC_MIXED; } -sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_QUOTED_IDENTIFIER_CASE,nValue,*this); return nValue == SQL_IC_UPPER; } -sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_IDENTIFIER_CASE,nValue,*this); @@ -516,21 +516,21 @@ bool ODatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw( ) ((nValue & SQL_AT_DROP_COLUMN_RESTRICT) == SQL_AT_DROP_COLUMN_RESTRICT); } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_INDEX_SIZE,nValue,*this); return nValue; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_NON_NULLABLE_COLUMNS,nValue,*this); return nValue == SQL_NNC_NON_NULL; } -OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) { OUString aVal; if(m_bUseCatalog) @@ -545,14 +545,14 @@ OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( ) return aVal; } -OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) { OUString aVal; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SPECIAL_CHARACTERS,aVal,*this,m_pConnection->getTextEncoding()); return aVal; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CORRELATION_NAME,nValue,*this); @@ -567,77 +567,77 @@ bool ODatabaseMetaData::impl_isCatalogAtStart_throw( ) return nValue == SQL_CL_START; } -sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_TXN_CAPABLE,nValue,*this); return nValue == SQL_TC_DDL_IGNORE; } -sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_TXN_CAPABLE,nValue,*this); return nValue == SQL_TC_DDL_COMMIT; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_TXN_CAPABLE,nValue,*this); return nValue == SQL_TC_DML; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_TXN_CAPABLE,nValue,*this); return nValue == SQL_TC_ALL; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DYNAMIC_CURSOR_ATTRIBUTES1,nValue,*this); return (nValue & SQL_CA1_POS_DELETE) == SQL_CA1_POS_DELETE; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DYNAMIC_CURSOR_ATTRIBUTES1,nValue,*this); return (nValue & SQL_CA1_POS_UPDATE) == SQL_CA1_POS_UPDATE; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CURSOR_ROLLBACK_BEHAVIOR,nValue,*this); return nValue == SQL_CB_PRESERVE || nValue == SQL_CB_CLOSE; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CURSOR_COMMIT_BEHAVIOR,nValue,*this); return nValue == SQL_CB_PRESERVE || nValue == SQL_CB_CLOSE; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CURSOR_COMMIT_BEHAVIOR,nValue,*this); return nValue == SQL_CB_PRESERVE; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CURSOR_ROLLBACK_BEHAVIOR,nValue,*this); return nValue == SQL_CB_PRESERVE; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 level ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_TXN_ISOLATION_OPTION,nValue,*this); @@ -651,28 +651,28 @@ bool ODatabaseMetaData::impl_supportsSchemasInDataManipulation_throw( ) return (nValue & SQL_SU_DML_STATEMENTS) == SQL_SU_DML_STATEMENTS; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SQL_CONFORMANCE,nValue,*this); return static_cast(nValue & SQL_SC_SQL92_FULL); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SQL_CONFORMANCE,nValue,*this); return static_cast(nValue &SQL_SC_SQL92_ENTRY); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility( ) { OUString aStr; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_INTEGRITY,aStr,*this,m_pConnection->getTextEncoding()); return aStr.toChar() == 'Y'; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SCHEMA_USAGE,nValue,*this); @@ -694,7 +694,7 @@ bool ODatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw( ) return (nValue & SQL_CU_TABLE_DEFINITION) == SQL_CU_TABLE_DEFINITION; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions( ) { SQLUINTEGER nValue=0; if(m_bUseCatalog) @@ -710,14 +710,14 @@ bool ODatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw( ) return (nValue & SQL_CU_DML_STATEMENTS) == SQL_CU_DML_STATEMENTS; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_OJ_CAPABILITIES,nValue,*this); return ((nValue & (SQL_OJ_FULL|SQL_OJ_LEFT|SQL_OJ_RIGHT|SQL_OJ_NESTED|SQL_OJ_NOT_ORDERED|SQL_OJ_ALL_COMPARISON_OPS|SQL_OJ_INNER)) != 0); } -Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) { Reference< XResultSet > xRef; try @@ -740,103 +740,103 @@ sal_Int32 ODatabaseMetaData::impl_getMaxStatements_throw( ) return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_PROCEDURE_NAME_LEN,nValue,*this); return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_SCHEMA_NAME_LEN,nValue,*this); return nValue; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_TXN_CAPABLE,nValue,*this); return nValue != SQL_TC_NONE; } -sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable( ) { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_ACCESSIBLE_PROCEDURES,aValue,*this,m_pConnection->getTextEncoding()); return aValue.toChar() == 'Y'; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures( ) { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_PROCEDURES,aValue,*this,m_pConnection->getTextEncoding()); return aValue.toChar() == 'Y'; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DYNAMIC_CURSOR_ATTRIBUTES1,nValue,*this); return (nValue & SQL_CA1_POSITIONED_UPDATE) == SQL_CA1_POSITIONED_UPDATE; } -sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable( ) { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_ACCESSIBLE_TABLES,aValue,*this,m_pConnection->getTextEncoding()); return aValue.toChar() == 'Y'; } -sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly( ) { return m_pConnection->isReadOnly(); } -sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_FILE_USAGE,nValue,*this); return nValue == SQL_FILE_CATALOG; } -sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_FILE_USAGE,nValue,*this); return nValue == SQL_FILE_TABLE; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CONVERT_FUNCTIONS,nValue,*this); return (nValue & SQL_FN_CVT_CONVERT) == SQL_FN_CVT_CONVERT; } -sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CONCAT_NULL_BEHAVIOR,nValue,*this); return nValue == SQL_CB_NULL; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing( ) { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_COLUMN_ALIAS,aValue,*this,m_pConnection->getTextEncoding()); return aValue.toChar() == 'Y'; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CORRELATION_NAME,nValue,*this); return nValue != SQL_CN_NONE; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 fromType, sal_Int32 toType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 fromType, sal_Int32 toType ) { if(fromType == toType) return true; @@ -992,77 +992,77 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 fromType, sal_In return bConvert; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy( ) { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_EXPRESSIONS_IN_ORDERBY,aValue,*this,m_pConnection->getTextEncoding()); return aValue.toChar() == 'Y'; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_GROUP_BY,nValue,*this); return nValue != SQL_GB_NOT_SUPPORTED; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_GROUP_BY,nValue,*this); return nValue != SQL_GB_GROUP_BY_CONTAINS_SELECT; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_GROUP_BY,nValue,*this); return nValue == SQL_GB_NO_RELATION; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions( ) { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MULTIPLE_ACTIVE_TXN,aValue,*this,m_pConnection->getTextEncoding()); return aValue.toChar() == 'Y'; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets( ) { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MULT_RESULT_SETS,aValue,*this,m_pConnection->getTextEncoding()); return aValue.toChar() == 'Y'; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause( ) { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_LIKE_ESCAPE_CLAUSE,aValue,*this,m_pConnection->getTextEncoding()); return aValue.toChar() == 'Y'; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated( ) { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_ORDER_BY_COLUMNS_IN_SELECT,aValue,*this,m_pConnection->getTextEncoding()); return aValue.toChar() == 'N'; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_UNION,nValue,*this); return (nValue & SQL_U_UNION) == SQL_U_UNION; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_UNION,nValue,*this); return (nValue & SQL_U_UNION_ALL) == SQL_U_UNION_ALL; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_IDENTIFIER_CASE,nValue,*this); @@ -1076,49 +1076,49 @@ bool ODatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw( ) return nValue == SQL_IC_MIXED; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_NULL_COLLATION,nValue,*this); return nValue == SQL_NC_END; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_NULL_COLLATION,nValue,*this); return nValue == SQL_NC_START; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_NULL_COLLATION,nValue,*this); return nValue == SQL_NC_HIGH; } -sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_NULL_COLLATION,nValue,*this); return nValue == SQL_NC_LOW; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SCHEMA_USAGE,nValue,*this); return (nValue & SQL_SU_PROCEDURE_INVOCATION) == SQL_SU_PROCEDURE_INVOCATION; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SCHEMA_USAGE,nValue,*this); return (nValue & SQL_SU_PRIVILEGE_DEFINITION) == SQL_SU_PRIVILEGE_DEFINITION; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls( ) { SQLUINTEGER nValue=0; if(m_bUseCatalog) @@ -1126,7 +1126,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw( return (nValue & SQL_CU_PROCEDURE_INVOCATION) == SQL_CU_PROCEDURE_INVOCATION; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) { SQLUINTEGER nValue=0; if(m_bUseCatalog) @@ -1134,42 +1134,42 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) return (nValue & SQL_CU_PRIVILEGE_DEFINITION) == SQL_CU_PRIVILEGE_DEFINITION; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SUBQUERIES,nValue,*this); return (nValue & SQL_SQ_CORRELATED_SUBQUERIES) == SQL_SQ_CORRELATED_SUBQUERIES; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SUBQUERIES,nValue,*this); return (nValue & SQL_SQ_COMPARISON) == SQL_SQ_COMPARISON; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SUBQUERIES,nValue,*this); return (nValue & SQL_SQ_EXISTS) == SQL_SQ_EXISTS; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SUBQUERIES,nValue,*this); return (nValue & SQL_SQ_IN) == SQL_SQ_IN; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SUBQUERIES,nValue,*this); return (nValue & SQL_SQ_QUANTIFIED) == SQL_SQ_QUANTIFIED; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SQL_CONFORMANCE,nValue,*this); @@ -1183,7 +1183,7 @@ OUString ODatabaseMetaData::getURLImpl() return aValue; } -OUString SAL_CALL ODatabaseMetaData::getURL( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getURL( ) { OUString aValue = m_pConnection->getURL(); if ( aValue.isEmpty() ) @@ -1193,56 +1193,56 @@ OUString SAL_CALL ODatabaseMetaData::getURL( ) throw(SQLException, RuntimeExcep return aValue; } -OUString SAL_CALL ODatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getUserName( ) { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_USER_NAME,aValue,*this,m_pConnection->getTextEncoding()); return aValue; } -OUString SAL_CALL ODatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getDriverName( ) { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DRIVER_NAME,aValue,*this,m_pConnection->getTextEncoding()); return aValue; } -OUString SAL_CALL ODatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getDriverVersion() { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DRIVER_ODBC_VER,aValue,*this,m_pConnection->getTextEncoding()); return aValue; } -OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DRIVER_VER,aValue,*this,m_pConnection->getTextEncoding()); return aValue; } -OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DBMS_NAME,aValue,*this,m_pConnection->getTextEncoding()); return aValue; } -OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_PROCEDURE_TERM,aValue,*this,m_pConnection->getTextEncoding()); return aValue; } -OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SCHEMA_TERM,aValue,*this,m_pConnection->getTextEncoding()); return aValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException, std::exception) try +sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion( ) try { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DRIVER_VER,aValue,*this,m_pConnection->getTextEncoding()); @@ -1253,7 +1253,7 @@ catch (const SQLException &) return 0; } -sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation( ) { SQLUINTEGER nValue; sal_Int32 nValueTranslated; @@ -1278,7 +1278,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation( ) throw(S return nValueTranslated; } -sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeException, std::exception) try +sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) try { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_DRIVER_VER,aValue,*this,m_pConnection->getTextEncoding()); @@ -1289,21 +1289,21 @@ catch (const SQLException &) return 0; } -OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_KEYWORDS,aValue,*this,m_pConnection->getTextEncoding()); return aValue; } -OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) { OUString aValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_SEARCH_PATTERN_ESCAPE,aValue,*this,m_pConnection->getTextEncoding()); return aValue; } -OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) { SQLUINTEGER nValue; OUStringBuffer aValue; @@ -1364,7 +1364,7 @@ OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) throw(SQLException, return aValue.makeStringAndClear(); } -OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) { SQLUINTEGER nValue; OUStringBuffer aValue; @@ -1419,7 +1419,7 @@ OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) throw(SQLException return aValue.makeStringAndClear(); } -OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) { SQLUINTEGER nValue; OUStringBuffer aValue; @@ -1438,7 +1438,7 @@ OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) throw(SQLException, return aValue.makeStringAndClear(); } -OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) { SQLUINTEGER nValue; OUStringBuffer aValue; @@ -1499,7 +1499,7 @@ OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) throw(SQLException, return aValue.makeStringAndClear(); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) { SQLUINTEGER nValue; // SQL_ODBC_SQL_CONFORMANCE is deprecated in ODBC 3.x, but there does not seem te be any equivalent. @@ -1510,7 +1510,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLExc return nValue == SQL_OSC_EXTENDED; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar( ) { SQLUINTEGER nValue; // SQL_ODBC_SQL_CONFORMANCE is deprecated in ODBC 3.x, but there does not seem te be any equivalent. @@ -1521,7 +1521,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar( ) throw(SQLExcepti return nValue == SQL_OSC_CORE || nValue == SQL_OSC_EXTENDED; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar( ) { SQLUINTEGER nValue; // SQL_ODBC_SQL_CONFORMANCE is deprecated in ODBC 3.x, but there does not seem te be any equivalent. @@ -1532,54 +1532,54 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar( ) throw(SQLExce return nValue == SQL_OSC_MINIMUM || nValue == SQL_OSC_CORE || nValue == SQL_OSC_EXTENDED; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins( ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_OJ_CAPABILITIES,nValue,*this); return (nValue & SQL_OJ_FULL) == SQL_OJ_FULL; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins( ) { return supportsFullOuterJoins( ); } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_COLUMNS_IN_GROUP_BY,nValue,*this); return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_COLUMNS_IN_ORDER_BY,nValue,*this); return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_COLUMNS_IN_SELECT,nValue,*this); return nValue; } -sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength( ) { SQLUSMALLINT nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_MAX_USER_NAME_LEN,nValue,*this); return nValue; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 setType ) { SQLUINTEGER nValue; OTools::GetInfo(m_pConnection,m_aConnectionHandle,SQL_CURSOR_SENSITIVITY,nValue,*this); return (nValue & static_cast(setType)) == static_cast(setType); } -sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 setType, sal_Int32 concurrency ) { SQLUINTEGER nValue; SQLUSMALLINT nAskFor( SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2 ); @@ -1611,7 +1611,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 set return bRet; } -sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType ) { SQLUINTEGER nValue; SQLUSMALLINT nAskFor( SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2 ); @@ -1633,7 +1633,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 setType ) t return (nValue & SQL_CA2_SENSITIVITY_UPDATES) == SQL_CA2_SENSITIVITY_UPDATES; } -sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType ) { SQLUINTEGER nValue; SQLUSMALLINT nAskFor( SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2 ); @@ -1655,7 +1655,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 setType ) t return (nValue & SQL_CA2_SENSITIVITY_DELETIONS) != SQL_CA2_SENSITIVITY_DELETIONS; } -sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType ) { SQLUINTEGER nValue; SQLUSMALLINT nAskFor( SQL_FORWARD_ONLY_CURSOR_ATTRIBUTES2 ); @@ -1677,42 +1677,42 @@ sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 setType ) t return (nValue & SQL_CA2_SENSITIVITY_ADDITIONS) == SQL_CA2_SENSITIVITY_ADDITIONS; } -sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 setType ) { return ownUpdatesAreVisible(setType); } -sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 setType ) { return ownDeletesAreVisible(setType); } -sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 setType ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 setType ) { return ownInsertsAreVisible(setType); } -sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 /*setType*/ ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 /*setType*/ ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 /*setType*/ ) { return false; } -sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates( ) { return false; } -Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) { return nullptr; } diff --git a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx index 91f4afd47252..bf3254aa2e6f 100644 --- a/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx +++ b/connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx @@ -98,13 +98,13 @@ void ODatabaseMetaDataResultSet::disposing() m_pConnection.clear(); } -Any SAL_CALL ODatabaseMetaDataResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL ODatabaseMetaDataResultSet::queryInterface( const Type & rType ) { Any aRet = OPropertySetHelper::queryInterface(rType); return aRet.hasValue() ? aRet : ODatabaseMetaDataResultSet_BASE::queryInterface(rType); } -Reference< XPropertySetInfo > SAL_CALL ODatabaseMetaDataResultSet::getPropertySetInfo( ) throw(RuntimeException, std::exception) +Reference< XPropertySetInfo > SAL_CALL ODatabaseMetaDataResultSet::getPropertySetInfo( ) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } @@ -119,7 +119,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::release() throw() ODatabaseMetaDataResultSet_BASE::release(); } -Sequence< Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes( ) throw(RuntimeException, std::exception) +Sequence< Type > SAL_CALL ODatabaseMetaDataResultSet::getTypes( ) { ::cppu::OTypeCollection aTypes( cppu::UnoType::get(), cppu::UnoType::get(), @@ -142,7 +142,7 @@ sal_Int32 ODatabaseMetaDataResultSet::mapColumn (sal_Int32 column) } -sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::findColumn( const OUString& columnName ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -189,20 +189,20 @@ template < typename T, SQLSMALLINT sqlTypeId > T ODatabaseMetaDataResultSet::get } -Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getBinaryStream", *this ); return nullptr; } -Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< css::io::XInputStream > SAL_CALL ODatabaseMetaDataResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getCharacterStream", *this ); return nullptr; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::getBoolean( sal_Int32 columnIndex ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -231,13 +231,13 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::getBoolean( sal_Int32 columnIndex } -sal_Int8 SAL_CALL ODatabaseMetaDataResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int8 SAL_CALL ODatabaseMetaDataResultSet::getByte( sal_Int32 columnIndex ) { return getInteger( columnIndex ); } -Sequence< sal_Int8 > SAL_CALL ODatabaseMetaDataResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Sequence< sal_Int8 > SAL_CALL ODatabaseMetaDataResultSet::getBytes( sal_Int32 columnIndex ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -266,7 +266,7 @@ Sequence< sal_Int8 > SAL_CALL ODatabaseMetaDataResultSet::getBytes( sal_Int32 co } -css::util::Date SAL_CALL ODatabaseMetaDataResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::Date SAL_CALL ODatabaseMetaDataResultSet::getDate( sal_Int32 columnIndex ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); @@ -288,7 +288,7 @@ css::util::Date SAL_CALL ODatabaseMetaDataResultSet::getDate( sal_Int32 columnIn } -double SAL_CALL ODatabaseMetaDataResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +double SAL_CALL ODatabaseMetaDataResultSet::getDouble( sal_Int32 columnIndex ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -305,7 +305,7 @@ double SAL_CALL ODatabaseMetaDataResultSet::getDouble( sal_Int32 columnIndex ) t } -float SAL_CALL ODatabaseMetaDataResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +float SAL_CALL ODatabaseMetaDataResultSet::getFloat( sal_Int32 columnIndex ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -322,25 +322,25 @@ float SAL_CALL ODatabaseMetaDataResultSet::getFloat( sal_Int32 columnIndex ) thr } -sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getInt( sal_Int32 columnIndex ) { return getInteger( columnIndex ); } -sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getRow( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL ODatabaseMetaDataResultSet::getRow( ) { return 0; } -sal_Int64 SAL_CALL ODatabaseMetaDataResultSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int64 SAL_CALL ODatabaseMetaDataResultSet::getLong( sal_Int32 columnIndex ) { return getInteger( columnIndex ); } -Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData( ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); @@ -349,46 +349,46 @@ Reference< XResultSetMetaData > SAL_CALL ODatabaseMetaDataResultSet::getMetaData return m_xMetaData; } -Reference< XArray > SAL_CALL ODatabaseMetaDataResultSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XArray > SAL_CALL ODatabaseMetaDataResultSet::getArray( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getArray", *this ); return nullptr; } -Reference< XClob > SAL_CALL ODatabaseMetaDataResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XClob > SAL_CALL ODatabaseMetaDataResultSet::getClob( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getClob", *this ); return nullptr; } -Reference< XBlob > SAL_CALL ODatabaseMetaDataResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XBlob > SAL_CALL ODatabaseMetaDataResultSet::getBlob( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getBlob", *this ); return nullptr; } -Reference< XRef > SAL_CALL ODatabaseMetaDataResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XRef > SAL_CALL ODatabaseMetaDataResultSet::getRef( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getRef", *this ); return nullptr; } -Any SAL_CALL ODatabaseMetaDataResultSet::getObject( sal_Int32 /*columnIndex*/, const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL ODatabaseMetaDataResultSet::getObject( sal_Int32 /*columnIndex*/, const Reference< css::container::XNameAccess >& /*typeMap*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getObject", *this ); return Any(); } -sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int16 SAL_CALL ODatabaseMetaDataResultSet::getShort( sal_Int32 columnIndex ) { return getInteger( columnIndex ); } -OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -406,7 +406,7 @@ OUString SAL_CALL ODatabaseMetaDataResultSet::getString( sal_Int32 columnIndex ) } -css::util::Time SAL_CALL ODatabaseMetaDataResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::Time SAL_CALL ODatabaseMetaDataResultSet::getTime( sal_Int32 columnIndex ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -423,7 +423,7 @@ css::util::Time SAL_CALL ODatabaseMetaDataResultSet::getTime( sal_Int32 columnIn } -css::util::DateTime SAL_CALL ODatabaseMetaDataResultSet::getTimestamp( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +css::util::DateTime SAL_CALL ODatabaseMetaDataResultSet::getTimestamp( sal_Int32 columnIndex ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -441,7 +441,7 @@ css::util::DateTime SAL_CALL ODatabaseMetaDataResultSet::getTimestamp( sal_Int32 } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isAfterLast( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isAfterLast( ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -451,7 +451,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isAfterLast( ) throw(SQLException return m_nCurrentFetchState == SQL_NO_DATA; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isFirst( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isFirst( ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -461,7 +461,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isFirst( ) throw(SQLException, Ru return m_nRowPos == 1; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast( ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -471,7 +471,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isLast( ) throw(SQLException, Run return m_bEOF && m_nCurrentFetchState != SQL_NO_DATA; } -void SAL_CALL ODatabaseMetaDataResultSet::beforeFirst( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ODatabaseMetaDataResultSet::beforeFirst( ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -483,7 +483,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::beforeFirst( ) throw(SQLException, Ru m_nCurrentFetchState = SQL_SUCCESS; } -void SAL_CALL ODatabaseMetaDataResultSet::afterLast( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ODatabaseMetaDataResultSet::afterLast( ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -495,7 +495,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::afterLast( ) throw(SQLException, Runt } -void SAL_CALL ODatabaseMetaDataResultSet::close( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ODatabaseMetaDataResultSet::close( ) { { @@ -507,7 +507,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::close( ) throw(SQLException, RuntimeE } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::first( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::first( ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -524,7 +524,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::first( ) throw(SQLException, Runt } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::last( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::last( ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed ); ::osl::MutexGuard aGuard( m_aMutex ); @@ -539,7 +539,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::last( ) throw(SQLException, Runti return bRet; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::absolute( sal_Int32 row ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -555,7 +555,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::absolute( sal_Int32 row ) throw(SQ return bRet; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::relative( sal_Int32 row ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -571,7 +571,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::relative( sal_Int32 row ) throw(SQ return bRet; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous( ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -589,13 +589,13 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::previous( ) throw(SQLException, R return bRet; } -Reference< XInterface > SAL_CALL ODatabaseMetaDataResultSet::getStatement( ) throw(SQLException, RuntimeException, std::exception) +Reference< XInterface > SAL_CALL ODatabaseMetaDataResultSet::getStatement( ) { return nullptr; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowDeleted( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowDeleted( ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -605,7 +605,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowDeleted( ) throw(SQLException, return m_pRowStatusArray[0] == SQL_ROW_DELETED; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowInserted( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowInserted( ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); @@ -614,7 +614,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowInserted( ) throw(SQLException return m_pRowStatusArray[0] == SQL_ROW_ADDED; } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated( ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -625,7 +625,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::rowUpdated( ) throw(SQLException, } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isBeforeFirst( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isBeforeFirst( ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -636,7 +636,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::isBeforeFirst( ) throw(SQLExcepti } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next( ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -655,7 +655,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::next( ) throw(SQLException, Runti } -sal_Bool SAL_CALL ODatabaseMetaDataResultSet::wasNull( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL ODatabaseMetaDataResultSet::wasNull( ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -665,7 +665,7 @@ sal_Bool SAL_CALL ODatabaseMetaDataResultSet::wasNull( ) throw(SQLException, Ru return m_bWasNull; } -void SAL_CALL ODatabaseMetaDataResultSet::refreshRow( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ODatabaseMetaDataResultSet::refreshRow( ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -674,7 +674,7 @@ void SAL_CALL ODatabaseMetaDataResultSet::refreshRow( ) throw(SQLException, Run } -void SAL_CALL ODatabaseMetaDataResultSet::cancel( ) throw(RuntimeException, std::exception) +void SAL_CALL ODatabaseMetaDataResultSet::cancel( ) { checkDisposed(ODatabaseMetaDataResultSet_BASE::rBHelper.bDisposed); @@ -684,22 +684,22 @@ void SAL_CALL ODatabaseMetaDataResultSet::cancel( ) throw(RuntimeException, std N3SQLCancel(m_aStatementHandle); } -void SAL_CALL ODatabaseMetaDataResultSet::clearWarnings( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL ODatabaseMetaDataResultSet::clearWarnings( ) { } -Any SAL_CALL ODatabaseMetaDataResultSet::getWarnings( ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL ODatabaseMetaDataResultSet::getWarnings( ) { return Any(); } -sal_Int32 ODatabaseMetaDataResultSet::getFetchSize() throw(SQLException, RuntimeException) +sal_Int32 ODatabaseMetaDataResultSet::getFetchSize() { sal_Int32 nValue=1; return nValue; } -OUString ODatabaseMetaDataResultSet::getCursorName() throw(SQLException, RuntimeException) +OUString ODatabaseMetaDataResultSet::getCursorName() { return OUString(); } @@ -735,9 +735,6 @@ sal_Bool ODatabaseMetaDataResultSet::convertFastPropertyValue( Any & rOldValue, sal_Int32 nHandle, const Any& rValue ) - throw (css::lang::IllegalArgumentException, - css::uno::RuntimeException, - std::exception) { switch(nHandle) { @@ -755,7 +752,7 @@ sal_Bool ODatabaseMetaDataResultSet::convertFastPropertyValue( return false; } -void ODatabaseMetaDataResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& /*rValue*/ ) throw (Exception, std::exception) +void ODatabaseMetaDataResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& /*rValue*/ ) { switch(nHandle) { @@ -792,7 +789,7 @@ void ODatabaseMetaDataResultSet::getFastPropertyValue( Any& rValue, sal_Int32 nH } } -void ODatabaseMetaDataResultSet::openTypeInfo() throw(SQLException, RuntimeException) +void ODatabaseMetaDataResultSet::openTypeInfo() { TInt2IntMap aMap; aMap[SQL_BIT] = DataType::BIT; @@ -836,7 +833,7 @@ void ODatabaseMetaDataResultSet::openTypeInfo() throw(SQLException, RuntimeExcep void ODatabaseMetaDataResultSet::openTables(const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, - const Sequence< OUString >& types ) throw(SQLException, RuntimeException) + const Sequence< OUString >& types ) { OString aPKQ,aPKO,aPKN,aCOL; const OUString *pSchemaPat = nullptr; @@ -883,7 +880,7 @@ void ODatabaseMetaDataResultSet::openTables(const Any& catalog, const OUString& } -void ODatabaseMetaDataResultSet::openTablesTypes( ) throw(SQLException, RuntimeException) +void ODatabaseMetaDataResultSet::openTablesTypes( ) { SQLRETURN nRetcode = N3SQLTables(m_aStatementHandle, nullptr,0, @@ -899,7 +896,7 @@ void ODatabaseMetaDataResultSet::openTablesTypes( ) throw(SQLException, RuntimeE checkColumnCount(); } -void ODatabaseMetaDataResultSet::openCatalogs() throw(SQLException, RuntimeException) +void ODatabaseMetaDataResultSet::openCatalogs() { SQLRETURN nRetcode = N3SQLTables(m_aStatementHandle, reinterpret_cast(const_cast(SQL_ALL_CATALOGS)),SQL_NTS, @@ -916,7 +913,7 @@ void ODatabaseMetaDataResultSet::openCatalogs() throw(SQLException, RuntimeExcep checkColumnCount(); } -void ODatabaseMetaDataResultSet::openSchemas() throw(SQLException, RuntimeException) +void ODatabaseMetaDataResultSet::openSchemas() { SQLRETURN nRetcode = N3SQLTables(m_aStatementHandle, reinterpret_cast(const_cast("")),SQL_NTS, @@ -934,7 +931,6 @@ void ODatabaseMetaDataResultSet::openSchemas() throw(SQLException, RuntimeExcept void ODatabaseMetaDataResultSet::openColumnPrivileges( const Any& catalog, const OUString& schema, const OUString& table, const OUString& columnNamePattern ) - throw(SQLException, RuntimeException) { const OUString *pSchemaPat = nullptr; @@ -969,7 +965,6 @@ void ODatabaseMetaDataResultSet::openColumnPrivileges( const Any& catalog, cons void ODatabaseMetaDataResultSet::openColumns( const Any& catalog, const OUString& schemaPattern, const OUString& tableNamePattern, const OUString& columnNamePattern ) - throw(SQLException, RuntimeException) { const OUString *pSchemaPat = nullptr; @@ -1037,7 +1032,6 @@ void ODatabaseMetaDataResultSet::openColumns( const Any& catalog, void ODatabaseMetaDataResultSet::openProcedureColumns( const Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern,const OUString& columnNamePattern ) - throw(SQLException, RuntimeException) { const OUString *pSchemaPat = nullptr; @@ -1071,7 +1065,6 @@ void ODatabaseMetaDataResultSet::openProcedureColumns( const Any& catalog, void ODatabaseMetaDataResultSet::openProcedures(const Any& catalog, const OUString& schemaPattern, const OUString& procedureNamePattern) - throw(SQLException, RuntimeException) { const OUString *pSchemaPat = nullptr; @@ -1102,7 +1095,6 @@ void ODatabaseMetaDataResultSet::openProcedures(const Any& catalog, const OUStri void ODatabaseMetaDataResultSet::openSpecialColumns(bool _bRowVer,const Any& catalog, const OUString& schema, const OUString& table,sal_Int32 scope, bool nullable ) - throw(SQLException, RuntimeException) { // Some ODBC drivers really don't like getting an empty string as tableName // E.g. psqlodbc up to at least version 09.01.0100 segfaults @@ -1142,13 +1134,13 @@ void ODatabaseMetaDataResultSet::openSpecialColumns(bool _bRowVer,const Any& cat } void ODatabaseMetaDataResultSet::openVersionColumns(const Any& catalog, const OUString& schema, - const OUString& table) throw(SQLException, RuntimeException) + const OUString& table) { openSpecialColumns(true,catalog,schema,table,SQL_SCOPE_TRANSACTION,false); } void ODatabaseMetaDataResultSet::openBestRowIdentifier( const Any& catalog, const OUString& schema, - const OUString& table,sal_Int32 scope,bool nullable ) throw(SQLException, RuntimeException) + const OUString& table,sal_Int32 scope,bool nullable ) { openSpecialColumns(false,catalog,schema,table,scope,nullable); } @@ -1156,7 +1148,7 @@ void ODatabaseMetaDataResultSet::openBestRowIdentifier( const Any& catalog, cons void ODatabaseMetaDataResultSet::openForeignKeys( const Any& catalog, const OUString* schema, const OUString* table, const Any& catalog2, const OUString* schema2, - const OUString* table2) throw(SQLException, RuntimeException) + const OUString* table2) { OString aPKQ, aPKO, aPKN, aFKQ, aFKO, aFKN; if ( catalog.hasValue() ) @@ -1185,20 +1177,20 @@ void ODatabaseMetaDataResultSet::openForeignKeys( const Any& catalog, const OUSt } void ODatabaseMetaDataResultSet::openImportedKeys(const Any& catalog, const OUString& schema, - const OUString& table) throw(SQLException, RuntimeException) + const OUString& table) { openForeignKeys(Any(),nullptr,nullptr,catalog, schema == "%" ? &schema : nullptr, &table); } void ODatabaseMetaDataResultSet::openExportedKeys(const Any& catalog, const OUString& schema, - const OUString& table) throw(SQLException, RuntimeException) + const OUString& table) { openForeignKeys(catalog, schema == "%" ? &schema : nullptr, &table,Any(),nullptr,nullptr); } void ODatabaseMetaDataResultSet::openPrimaryKeys(const Any& catalog, const OUString& schema, - const OUString& table) throw(SQLException, RuntimeException) + const OUString& table) { const OUString *pSchemaPat = nullptr; @@ -1227,7 +1219,7 @@ void ODatabaseMetaDataResultSet::openPrimaryKeys(const Any& catalog, const OUStr } void ODatabaseMetaDataResultSet::openTablePrivileges(const Any& catalog, const OUString& schemaPattern, - const OUString& tableNamePattern) throw(SQLException, RuntimeException) + const OUString& tableNamePattern) { const OUString *pSchemaPat = nullptr; @@ -1257,7 +1249,6 @@ void ODatabaseMetaDataResultSet::openTablePrivileges(const Any& catalog, const O void ODatabaseMetaDataResultSet::openIndexInfo( const Any& catalog, const OUString& schema, const OUString& table, bool unique, bool approximate ) - throw(SQLException, RuntimeException) { const OUString *pSchemaPat = nullptr; diff --git a/connectivity/source/drivers/odbc/ODriver.cxx b/connectivity/source/drivers/odbc/ODriver.cxx index aad846a8e753..c22db08d7226 100644 --- a/connectivity/source/drivers/odbc/ODriver.cxx +++ b/connectivity/source/drivers/odbc/ODriver.cxx @@ -57,7 +57,7 @@ void ODBCDriver::disposing() // static ServiceInfo -OUString ODBCDriver::getImplementationName_Static( ) throw(RuntimeException) +OUString ODBCDriver::getImplementationName_Static( ) { return OUString("com.sun.star.comp.sdbc.ODBCDriver"); // this name is referenced in the configuration and in the odbc.xml @@ -65,31 +65,31 @@ OUString ODBCDriver::getImplementationName_Static( ) throw(RuntimeException) } -Sequence< OUString > ODBCDriver::getSupportedServiceNames_Static( ) throw (RuntimeException) +Sequence< OUString > ODBCDriver::getSupportedServiceNames_Static( ) { Sequence aSNS { "com.sun.star.sdbc.Driver" }; return aSNS; } -OUString SAL_CALL ODBCDriver::getImplementationName( ) throw(RuntimeException, std::exception) +OUString SAL_CALL ODBCDriver::getImplementationName( ) { return getImplementationName_Static(); } -sal_Bool SAL_CALL ODBCDriver::supportsService( const OUString& _rServiceName ) throw(RuntimeException, std::exception) +sal_Bool SAL_CALL ODBCDriver::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } -Sequence< OUString > SAL_CALL ODBCDriver::getSupportedServiceNames( ) throw(RuntimeException, std::exception) +Sequence< OUString > SAL_CALL ODBCDriver::getSupportedServiceNames( ) { return getSupportedServiceNames_Static(); } -Reference< XConnection > SAL_CALL ODBCDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > SAL_CALL ODBCDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) { if ( ! acceptsURL(url) ) return nullptr; @@ -109,12 +109,11 @@ Reference< XConnection > SAL_CALL ODBCDriver::connect( const OUString& url, cons } sal_Bool SAL_CALL ODBCDriver::acceptsURL( const OUString& url ) - throw(SQLException, RuntimeException, std::exception) { return url.startsWith("sdbc:odbc:"); } -Sequence< DriverPropertyInfo > SAL_CALL ODBCDriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException, std::exception) +Sequence< DriverPropertyInfo > SAL_CALL ODBCDriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) { if ( acceptsURL(url) ) { @@ -196,12 +195,12 @@ Sequence< DriverPropertyInfo > SAL_CALL ODBCDriver::getPropertyInfo( const OUStr return Sequence< DriverPropertyInfo >(); } -sal_Int32 SAL_CALL ODBCDriver::getMajorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL ODBCDriver::getMajorVersion( ) { return 1; } -sal_Int32 SAL_CALL ODBCDriver::getMinorVersion( ) throw(RuntimeException, std::exception) +sal_Int32 SAL_CALL ODBCDriver::getMinorVersion( ) { return 0; } diff --git a/connectivity/source/drivers/odbc/OPreparedStatement.cxx b/connectivity/source/drivers/odbc/OPreparedStatement.cxx index 6b33d555c7f2..545b7645c38c 100644 --- a/connectivity/source/drivers/odbc/OPreparedStatement.cxx +++ b/connectivity/source/drivers/odbc/OPreparedStatement.cxx @@ -99,19 +99,19 @@ void SAL_CALL OPreparedStatement::release() throw() OStatement_BASE2::release(); } -Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) { Any aRet = OStatement_BASE2::queryInterface(rType); return aRet.hasValue() ? aRet : OPreparedStatement_BASE::queryInterface(rType); } -css::uno::Sequence< css::uno::Type > SAL_CALL OPreparedStatement::getTypes( ) throw(css::uno::RuntimeException, std::exception) +css::uno::Sequence< css::uno::Type > SAL_CALL OPreparedStatement::getTypes( ) { return ::comphelper::concatSequences(OPreparedStatement_BASE::getTypes(),OStatement_BASE2::getTypes()); } -Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -125,7 +125,7 @@ Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData( ) thr } -void SAL_CALL OPreparedStatement::close( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::close( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -150,7 +150,7 @@ void SAL_CALL OPreparedStatement::close( ) throw(SQLException, RuntimeException } -sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OPreparedStatement::execute( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -213,7 +213,7 @@ sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeExc } -sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -236,13 +236,13 @@ sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) throw(SQLException, Run } -void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) { setParameter(parameterIndex, DataType::CHAR, invalid_scale, x); } -Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( ) throw(SQLException, RuntimeException, std::exception) +Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -251,7 +251,7 @@ Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( ) throw(SQ } -Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -271,7 +271,7 @@ Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) throw(SQLE } -void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 parameterIndex, sal_Bool x ) { // Set the parameter as if it were an integer setInt (parameterIndex, x ? 1 : 0 ); @@ -412,18 +412,18 @@ void OPreparedStatement::setParameter(const sal_Int32 parameterIndex, const sal_ OTools::ThrowException(m_pConnection.get(), nRetcode, m_aStatementHandle, SQL_HANDLE_STMT, *this); } -void SAL_CALL OPreparedStatement::setByte( const sal_Int32 parameterIndex, const sal_Int8 x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setByte( const sal_Int32 parameterIndex, const sal_Int8 x ) { setScalarParameter(parameterIndex, DataType::TINYINT, 3, 0, x); } -void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const Date& aData ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setDate( sal_Int32 parameterIndex, const Date& aData ) { DATE_STRUCT x(OTools::DateToOdbcDate(aData)); setScalarParameter(parameterIndex, DataType::DATE, 10, x); } -void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const css::util::Time& aVal ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const css::util::Time& aVal ) { SQLULEN nColSize; if(aVal.NanoSeconds == 0) @@ -451,7 +451,7 @@ void SAL_CALL OPreparedStatement::setTime( sal_Int32 parameterIndex, const css:: } -void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const DateTime& aVal ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const DateTime& aVal ) { SQLULEN nColSize; if(aVal.NanoSeconds == 0) @@ -485,25 +485,25 @@ void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 parameterIndex, const } -void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setDouble( sal_Int32 parameterIndex, double x ) { setScalarParameter(parameterIndex, DataType::DOUBLE, 15, x); } -void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setFloat( sal_Int32 parameterIndex, float x ) { setScalarParameter(parameterIndex, DataType::FLOAT, 15, x); } -void SAL_CALL OPreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setInt( sal_Int32 parameterIndex, sal_Int32 x ) { setScalarParameter(parameterIndex, DataType::INTEGER, 10, 0, x); } -void SAL_CALL OPreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x ) { try { @@ -516,7 +516,7 @@ void SAL_CALL OPreparedStatement::setLong( sal_Int32 parameterIndex, sal_Int64 x } -void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, const sal_Int32 _nType ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, const sal_Int32 _nType ) { ::osl::MutexGuard aGuard( m_aMutex ); setParameterPre(parameterIndex); @@ -550,32 +550,32 @@ void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, const sal_I } -void SAL_CALL OPreparedStatement::setClob( sal_Int32 parameterIndex, const Reference< XClob >& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setClob( sal_Int32 parameterIndex, const Reference< XClob >& x ) { if ( x.is() ) setStream(parameterIndex, x->getCharacterStream(), x->length(), DataType::LONGVARCHAR); } -void SAL_CALL OPreparedStatement::setBlob( sal_Int32 parameterIndex, const Reference< XBlob >& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setBlob( sal_Int32 parameterIndex, const Reference< XBlob >& x ) { if ( x.is() ) setStream(parameterIndex, x->getBinaryStream(), x->length(), DataType::LONGVARBINARY); } -void SAL_CALL OPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setArray", *this ); } -void SAL_CALL OPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XParameters::setRef", *this ); } -void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 sqlType, sal_Int32 scale ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, const Any& x, sal_Int32 sqlType, sal_Int32 scale ) { checkDisposed(OStatement_BASE::rBHelper.bDisposed); ::osl::MutexGuard aGuard( m_aMutex ); @@ -616,13 +616,13 @@ void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 parameterIndex, c } -void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) { setNull(parameterIndex,sqlType); } -void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) { if (!::dbtools::implSetObject(this, parameterIndex, x)) { // there is no other setXXX call which can handle the value in x @@ -631,19 +631,19 @@ void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any } -void SAL_CALL OPreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setShort( sal_Int32 parameterIndex, sal_Int16 x ) { setScalarParameter(parameterIndex, DataType::SMALLINT, 5, 0, x); } -void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setBytes( sal_Int32 parameterIndex, const Sequence< sal_Int8 >& x ) { setParameter(parameterIndex, DataType::BINARY, x); } -void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) { // LEM: It is quite unclear to me what the interface here is. // The XInputStream provides *bytes*, not characters. @@ -651,13 +651,13 @@ void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 parameterIndex, } -void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 parameterIndex, const Reference< css::io::XInputStream >& x, sal_Int32 length ) { setStream(parameterIndex, x, length, DataType::LONGVARBINARY); } -void SAL_CALL OPreparedStatement::clearParameters( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::clearParameters( ) { ::osl::MutexGuard aGuard( m_aMutex ); prepareStatement(); @@ -666,7 +666,7 @@ void SAL_CALL OPreparedStatement::clearParameters( ) throw(SQLException, Runtim N3SQLFreeStmt (m_aStatementHandle, SQL_UNBIND); } -void SAL_CALL OPreparedStatement::clearBatch( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::clearBatch( ) { ::dbtools::throwFunctionNotSupportedSQLException( "XPreparedBatchExecution::clearBatch", *this ); // clearParameters( ); @@ -674,13 +674,13 @@ void SAL_CALL OPreparedStatement::clearBatch( ) throw(SQLException, RuntimeExce } -void SAL_CALL OPreparedStatement::addBatch( ) throw(SQLException, RuntimeException, std::exception) +void SAL_CALL OPreparedStatement::addBatch( ) { ::dbtools::throwFunctionNotSupportedSQLException( "XPreparedBatchExecution::addBatch", *this ); } -Sequence< sal_Int32 > SAL_CALL OPreparedStatement::executeBatch( ) throw(SQLException, RuntimeException, std::exception) +Sequence< sal_Int32 > SAL_CALL OPreparedStatement::executeBatch( ) { ::dbtools::throwFunctionNotSupportedSQLException( "XPreparedBatchExecution::executeBatch", *this ); // not reached, but keep -Werror happy @@ -695,7 +695,7 @@ Sequence< sal_Int32 > SAL_CALL OPreparedStatement::executeBatch( ) throw(SQLExc // Initialize the bound parameter objects -void OPreparedStatement::initBoundParam () throw(SQLException) +void OPreparedStatement::initBoundParam () { OSL_ENSURE(m_aStatementHandle,"StatementHandle is null!"); // Get the number of parameters @@ -759,7 +759,6 @@ SQLLEN* OPreparedStatement::getLengthBuf (sal_Int32 index) // Puts parameter data from a previously bound input stream. The // input stream was bound using SQL_LEN_DATA_AT_EXEC. void OPreparedStatement::putParamData (sal_Int32 index) - throw (SQLException, RuntimeException) { // Sanity check the parameter index if ((index < 1) || @@ -827,7 +826,6 @@ void OPreparedStatement::setStream( const Reference< XInputStream>& x, SQLLEN length, sal_Int32 _nType) - throw (SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OStatement_BASE::rBHelper.bDisposed); @@ -878,7 +876,7 @@ void OPreparedStatement::FreeParams() boundParams = nullptr; } -void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception, std::exception) +void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) { try { diff --git a/connectivity/source/drivers/odbc/ORealDriver.cxx b/connectivity/source/drivers/odbc/ORealDriver.cxx index 7c88c3260243..9ad73f59038e 100644 --- a/connectivity/source/drivers/odbc/ORealDriver.cxx +++ b/connectivity/source/drivers/odbc/ORealDriver.cxx @@ -258,7 +258,7 @@ oslGenericFunction ORealObdcDriver::getOdbcFunction(ODBC3SQLFunctionId _nIndex) } -css::uno::Reference< css::uno::XInterface > SAL_CALL ODBCDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) throw( css::uno::Exception ) +css::uno::Reference< css::uno::XInterface > SAL_CALL ODBCDriver_CreateInstance(const css::uno::Reference< css::lang::XMultiServiceFactory >& _rxFactory) { return *(new ORealObdcDriver(_rxFactory)); } diff --git a/connectivity/source/drivers/odbc/ORealDriver.hxx b/connectivity/source/drivers/odbc/ORealDriver.hxx index d015bb42c0bd..b4b092b87697 100644 --- a/connectivity/source/drivers/odbc/ORealDriver.hxx +++ b/connectivity/source/drivers/odbc/ORealDriver.hxx @@ -34,8 +34,7 @@ namespace connectivity { namespace odbc { /// @throws css::uno::Exception css::uno::Reference< css::uno::XInterface > -ODBCDriver_CreateInstance( css::uno::Reference< css::lang::XMultiServiceFactory > const & factory) - throw (css::uno::Exception); +ODBCDriver_CreateInstance( css::uno::Reference< css::lang::XMultiServiceFactory > const & factory); } } diff --git a/connectivity/source/drivers/odbc/OResultSet.cxx b/connectivity/source/drivers/odbc/OResultSet.cxx index 3b2ffb848e99..9b9acd0681f2 100644 --- a/connectivity/source/drivers/odbc/OResultSet.cxx +++ b/connectivity/source/drivers/odbc/OResultSet.cxx @@ -62,12 +62,12 @@ namespace // IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet"); -OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException, std::exception) +OUString SAL_CALL OResultSet::getImplementationName( ) { return OUString("com.sun.star.sdbcx.odbc.ResultSet"); } - Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw( RuntimeException, std::exception) + Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) { Sequence< OUString > aSupported(2); aSupported[0] = "com.sun.star.sdbc.ResultSet"; @@ -75,7 +75,7 @@ OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException return aSupported; } -sal_Bool SAL_CALL OResultSet::supportsService( const OUString& _rServiceName ) throw( RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::supportsService( const OUString& _rServiceName ) { return cppu::supportsService(this, _rServiceName); } @@ -345,13 +345,13 @@ void OResultSet::releaseBuffer() m_aLengthVector.clear(); } -Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeException, std::exception) +Any SAL_CALL OResultSet::queryInterface( const Type & rType ) { Any aRet = OPropertySetHelper::queryInterface(rType); return aRet.hasValue() ? aRet : OResultSet_BASE::queryInterface(rType); } - Sequence< Type > SAL_CALL OResultSet::getTypes( ) throw( RuntimeException, std::exception) + Sequence< Type > SAL_CALL OResultSet::getTypes( ) { OTypeCollection aTypes( cppu::UnoType::get(), cppu::UnoType::get(), @@ -361,7 +361,7 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep } -sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) { checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -413,7 +413,7 @@ void OResultSet::invalidateCache() } } -Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -423,7 +423,7 @@ Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 /*colu return nullptr; } -Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -443,7 +443,7 @@ template < typename T > T OResultSet::impl_getValue( const sal_Int32 _nColumnInd } // this function exists for the implicit conversion to sal_Bool (compared to a direct call to impl_getValue) -bool OResultSet::impl_getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +bool OResultSet::impl_getBoolean( sal_Int32 columnIndex ) { return impl_getValue(columnIndex, SQL_C_BIT); } @@ -456,18 +456,18 @@ template < typename T > T OResultSet::getValue( sal_Int32 columnIndex ) m_bWasNull = m_aRow[columnIndex].isNull(); return m_aRow[columnIndex]; } -sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 columnIndex ) { return getValue( columnIndex ); } -sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 columnIndex ) { return getValue( columnIndex ); } -Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -491,7 +491,7 @@ Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 columnIndex ) thro } return nRet; } -Sequence< sal_Int8 > OResultSet::impl_getBytes( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +Sequence< sal_Int8 > OResultSet::impl_getBytes( sal_Int32 columnIndex ) { const SWORD nColumnType = impl_getColumnType_nothrow(columnIndex); @@ -512,7 +512,7 @@ Sequence< sal_Int8 > OResultSet::impl_getBytes( sal_Int32 columnIndex ) throw(SQ } } -Date OResultSet::impl_getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +Date OResultSet::impl_getDate( sal_Int32 columnIndex ) { DATE_STRUCT aDate = impl_getValue< DATE_STRUCT> ( columnIndex, m_pStatement->getOwnConnection()->useOldDateFormat() ? SQL_C_DATE : SQL_C_TYPE_DATE ); @@ -520,38 +520,38 @@ Date OResultSet::impl_getDate( sal_Int32 columnIndex ) throw(SQLException, Runti return Date(aDate.day, aDate.month, aDate.year); } -Date SAL_CALL OResultSet::getDate( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Date SAL_CALL OResultSet::getDate( sal_Int32 columnIndex ) { return getValue( columnIndex ); } -double SAL_CALL OResultSet::getDouble( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +double SAL_CALL OResultSet::getDouble( sal_Int32 columnIndex ) { return getValue( columnIndex ); } -float SAL_CALL OResultSet::getFloat( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +float SAL_CALL OResultSet::getFloat( sal_Int32 columnIndex ) { return getValue( columnIndex ); } -sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 columnIndex ) { return getValue( columnIndex ); } -sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 columnIndex ) { return getValue( columnIndex ); } -sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 columnIndex ) { return getValue( columnIndex ); } -sal_Int64 OResultSet::impl_getLong( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +sal_Int64 OResultSet::impl_getLong( sal_Int32 columnIndex ) { try { @@ -563,7 +563,7 @@ sal_Int64 OResultSet::impl_getLong( sal_Int32 columnIndex ) throw(SQLException, } } -sal_Int32 SAL_CALL OResultSet::getRow( ) throw(SQLException, RuntimeException, std::exception) +sal_Int32 SAL_CALL OResultSet::getRow( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -571,7 +571,7 @@ sal_Int32 SAL_CALL OResultSet::getRow( ) throw(SQLException, RuntimeException, return m_pSkipDeletedSet ? m_pSkipDeletedSet->getMappedPosition(getDriverPos()) : getDriverPos(); } -Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) throw(SQLException, RuntimeException, std::exception) +Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -582,62 +582,62 @@ Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) throw(SQLEx return m_xMetaData; } -Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getArray", *this ); return nullptr; } -Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getClob", *this ); return nullptr; } -Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getBlob", *this ); return nullptr; } -Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException, std::exception) +Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) { ::dbtools::throwFunctionNotSupportedSQLException( "XRow::getRef", *this ); return nullptr; } -Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException, std::exception) +Any SAL_CALL OResultSet::getObject( sal_Int32 columnIndex, const Reference< css::container::XNameAccess >& /*typeMap*/ ) { return getValue( columnIndex ).makeAny(); } -OUString OResultSet::impl_getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +OUString OResultSet::impl_getString( sal_Int32 columnIndex ) { checkDisposed(OResultSet_BASE::rBHelper.bDisposed); const SWORD nColumnType = impl_getColumnType_nothrow(columnIndex); return OTools::getStringValue(m_pStatement->getOwnConnection(),m_aStatementHandle,columnIndex,nColumnType,m_bWasNull,**this,m_nTextEncoding); } -OUString OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +OUString OResultSet::getString( sal_Int32 columnIndex ) { return getValue( columnIndex ); } -Time OResultSet::impl_getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) +Time OResultSet::impl_getTime( sal_Int32 columnIndex ) { TIME_STRUCT aTime = impl_getValue< TIME_STRUCT > ( columnIndex, m_pStatement->getOwnConnection()->useOldDateFormat() ? SQL_C_TIME : SQL_C_TYPE_TIME ); return Time(0, aTime.second,aTime.minute,aTime.hour, false); } -Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) throw(SQLException, RuntimeException, std::exception) +Time SAL_CALL OResultSet::getTime( sal_Int32 columnIndex ) { return getValue